-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Install ovphysx wheel by default in --install
#5780
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
Merged
AntoineRichard
merged 18 commits into
isaac-sim:develop
from
AntoineRichard:antoiner/ovphysx-default-install
Jun 9, 2026
Merged
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
3c1f41d
Register device_split pytest marker
AntoineRichard 0b18415
Add is_device_split_file predicate with unit tests
AntoineRichard d185c50
Drop dead scripts/run_ovphysx.sh references from device_split docs
AntoineRichard f0a12eb
Factor per-file pytest invocation in conftest into _run_one_pass helper
AntoineRichard 37ee8e1
Run device_split-marked test files twice in conftest (CPU then GPU)
AntoineRichard 55b3f73
Mark test_views_xform_prim_ovphysx as device_split
AntoineRichard 40fc8d5
Mark test_contact_sensor (ovphysx) as device_split
AntoineRichard 48d5682
Add changelog fragment for ovphysx device_split CI fix
AntoineRichard 349608c
Drop dead is_cold_cache_test field; dedup failed_tests
AntoineRichard ec6f667
Keep ovphysx optional in installs
AntoineRichard a47511b
Format test runner conftest
AntoineRichard 98bfa09
Revert broad device split runner changes
AntoineRichard 1fce150
Add ovphysx CI changelog skip
AntoineRichard 2dba76d
Restore automatic ovphysx device split
AntoineRichard 6653d32
Merge branch 'develop' into antoiner/ovphysx-default-install
AntoineRichard dbd83a4
Show device split runs in test summary
AntoineRichard 5f232fb
Remove device split runs summary column
AntoineRichard c746eaa
Address ovphysx device split review
AntoineRichard File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
source/isaaclab_ovphysx/changelog.d/antoiner-ovphysx-device-split-ci.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| Fixed | ||
| ^^^^^ | ||
|
|
||
| * Re-enabled both CPU and GPU coverage in CI for OVPhysX tests by tagging | ||
| :file:`test/assets/test_articulation.py`, | ||
| :file:`test/assets/test_rigid_object.py`, | ||
| :file:`test/assets/test_rigid_object_collection.py`, | ||
| :file:`test/sensors/test_contact_sensor.py`, and | ||
| :file:`test/sim/test_views_xform_prim_ovphysx.py` with the new | ||
| ``device_split`` pytest marker, which causes the CI driver to invoke each | ||
| file once per device in separate subprocesses. Works around the | ||
| ``ovphysx<=0.3.7`` process-global device lock (gap G5). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| # 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 | ||
|
|
||
| """Helpers for detecting and driving the ``device_split`` pytest marker. | ||
|
|
||
| Test files that declare ``pytestmark = pytest.mark.device_split`` at module | ||
| scope must be re-invoked once per device (CPU and GPU) in separate processes | ||
| to work around process-global device locks such as ``ovphysx<=0.3.7`` gap G5. | ||
| The :func:`is_device_split_file` predicate lets the per-file CI runner in | ||
| ``tools/conftest.py`` detect this without importing the test module. | ||
| """ | ||
|
|
||
| from __future__ import annotations | ||
|
|
||
| import re | ||
| from pathlib import Path | ||
|
|
||
| _DEVICE_SPLIT_MARK_RE = re.compile(r"^\s*pytestmark\b.*\bdevice_split\b", re.MULTILINE) | ||
| """Match a module-level ``pytestmark`` assignment that mentions ``device_split``. | ||
|
|
||
| Recognises both single-mark and single-line list forms: | ||
|
|
||
| * ``pytestmark = pytest.mark.device_split`` | ||
| * ``pytestmark = [pytest.mark.device_split, pytest.mark.foo]`` | ||
|
|
||
| Multi-line list forms are not supported (currently no test file uses one); if | ||
| a future test needs that, expand the parsing rule. | ||
| """ | ||
|
|
||
| # Per-pass pytest ``-k`` selectors used by ``tools/conftest.py`` when a file | ||
| # declares the ``device_split`` marker. Each entry is ``(suffix, k_expr)``: | ||
| # - ``suffix`` is appended to the JUnit report filename to keep both passes' XML. | ||
| # - ``k_expr`` is the ``-k`` keyword expression. ``"cpu or not cuda"`` keeps | ||
| # non-parametrized tests in the CPU pass; ``"cuda"`` catches GPU-parametrized | ||
| # tests only. | ||
| DEVICE_SPLIT_PASSES: list[tuple[str, str]] = [ | ||
| ("-cpu", "cpu or not cuda"), | ||
| ("-cuda", "cuda"), | ||
| ] | ||
|
|
||
|
|
||
| def is_device_split_file(path: Path | str, source: str | None = None) -> bool: | ||
| """Return whether the test file at ``path`` declares the ``device_split`` marker. | ||
|
|
||
| Matches :data:`_DEVICE_SPLIT_MARK_RE` against ``source`` when supplied. | ||
| Otherwise, reads the file source from ``path``. A missing or unreadable | ||
| file returns ``False`` so the caller falls back to the default single-pass | ||
| invocation. | ||
|
|
||
| Args: | ||
| path: Filesystem path to a candidate test file. | ||
| source: Optional preloaded source text to inspect. | ||
|
|
||
| Returns: | ||
| ``True`` when the file's module-level ``pytestmark`` mentions | ||
| ``device_split``; ``False`` otherwise. | ||
| """ | ||
| if source is None: | ||
| try: | ||
| source = Path(path).read_text(encoding="utf-8", errors="replace") | ||
| except OSError: | ||
| return False | ||
| return bool(_DEVICE_SPLIT_MARK_RE.search(source)) |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
uhm the installs could fail but CI might keep going with those
importorskip, no? and quietly telling a green outcome. Just confirming this is the intended behavior.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.
Confirmed: the extra package install runs inside the Docker test command under set -e, and .github/actions/run-tests/action.yml returns the container exit code after copying reports. So if pip install ovphysx fails, the job fails before pytest/importorskip can produce a green result. The importorskip guards are only for local or partial installs where the optional wheel was not requested.