-
Notifications
You must be signed in to change notification settings - Fork 463
Fix multi-world joint indexing in warp-to-mj coord conversion #2332
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
Open
jsw7460
wants to merge
6
commits into
newton-physics:main
Choose a base branch
from
jsw7460:sangwooshin/fix-warp-coords-kernel-indexing
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+143
−7
Open
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
15dc705
Fix multi-world joint indexing in warp-to-mj coord conversion
jsw7460 a436463
Add CHANGELOG entry for multi-world coordinate conversion fix
jsw7460 085cdb8
Run multi-world CoM test on all devices
jsw7460 66f2b01
Simplify multi-world test: address reviewer feedback
jsw7460 4bee403
Move CHANGELOG entry to Unreleased section
jsw7460 a0cf988
Merge branch 'main' into sangwooshin/fix-warp-coords-kernel-indexing
jsw7460 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
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,133 @@ | ||
| # SPDX-FileCopyrightText: Copyright (c) 2026 The Newton Developers | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| """Test that per-world body property changes produce correct physics. | ||
|
|
||
| Regression test for a bug in convert_warp_coords_to_mj_kernel where | ||
| joint_type and joint_child were indexed with the per-world joint index | ||
| instead of the global index, causing incorrect CoM references for | ||
| worlds with worldid > 0. | ||
| """ | ||
|
|
||
| import unittest | ||
|
|
||
| import numpy as np | ||
| import warp as wp | ||
|
|
||
| import newton | ||
| from newton.solvers import SolverMuJoCo | ||
| from newton.tests.unittest_utils import add_function_test, get_test_devices | ||
|
|
||
|
|
||
| def _build_model_with_per_world_com(device, world_base_coms): | ||
| """Build a multi-world model where each world has a free-floating | ||
| body with its own base CoM. | ||
| """ | ||
| scene = newton.ModelBuilder() | ||
|
|
||
| for base_com in world_base_coms: | ||
| template = newton.ModelBuilder() | ||
| base = template.add_link( | ||
| mass=5.0, | ||
| com=base_com, | ||
| inertia=wp.mat33(np.eye(3) * 0.1), | ||
| ) | ||
| j_free = template.add_joint_free(parent=-1, child=base) | ||
| template.add_articulation([j_free]) | ||
|
|
||
| scene.begin_world() | ||
| scene.add_builder(template) | ||
| scene.end_world() | ||
|
|
||
| return scene.finalize(device=device) | ||
|
|
||
|
|
||
| def _run_sim(model, num_steps: int = 100, sim_dt: float = 1e-3): | ||
| """Step simulation and return final joint_q as numpy array.""" | ||
| solver = SolverMuJoCo(model) | ||
|
|
||
| state_0 = model.state() | ||
| state_1 = model.state() | ||
| control = model.control() | ||
|
|
||
| # Set initial height and angular velocity for all worlds. | ||
| # Non-zero angular velocity is critical: the bug in | ||
| # convert_warp_coords_to_mj_kernel affects the velocity | ||
| # conversion v_origin = v_com - w x com. With w=0 the cross | ||
| # product vanishes and the wrong com is harmless. | ||
| nw = model.world_count | ||
| q_per_world = model.joint_coord_count // nw | ||
| qd_per_world = model.joint_dof_count // nw | ||
| joint_q = state_0.joint_q.numpy().reshape(nw, q_per_world) | ||
| joint_q[:, 2] = 1.0 # z = 1m for all worlds | ||
| state_0.joint_q.assign(joint_q.flatten()) | ||
| state_1.joint_q.assign(joint_q.flatten()) | ||
| # Set initial angular velocity (world frame) on the free joint | ||
| joint_qd = state_0.joint_qd.numpy().reshape(nw, qd_per_world) | ||
| joint_qd[:, 3] = 1.0 # wx = 1 rad/s | ||
| joint_qd[:, 4] = 0.5 # wy = 0.5 rad/s | ||
| state_0.joint_qd.assign(joint_qd.flatten()) | ||
| state_1.joint_qd.assign(joint_qd.flatten()) | ||
| newton.eval_fk(model, state_0.joint_q, state_0.joint_qd, state_0) | ||
| newton.eval_fk(model, state_1.joint_q, state_1.joint_qd, state_1) | ||
|
|
||
| for _ in range(num_steps): | ||
| state_0.clear_forces() | ||
| solver.step(state_0, state_1, control, None, sim_dt) | ||
| state_0, state_1 = state_1, state_0 | ||
|
|
||
| return state_0.joint_q.numpy() | ||
|
|
||
|
|
||
| def test_perworld_com_produces_consistent_physics(test, device): | ||
| """Multi-world with different per-world base CoM should match | ||
| independent single-world runs with the same CoM.""" | ||
| com_a = wp.vec3(0.0, 0.0, 0.0) | ||
| com_b = wp.vec3(0.05, 0.0, -0.02) | ||
|
|
||
| # --- Reference: single-world runs --- | ||
| ref_q = {} | ||
| for com_val, label in [(com_a, "A"), (com_b, "B")]: | ||
| model = _build_model_with_per_world_com(device, [com_val]) | ||
| ref_q[label] = _run_sim(model) | ||
|
|
||
| # --- Multi-world run --- | ||
| model = _build_model_with_per_world_com(device, [com_a, com_b]) | ||
| multi_q = _run_sim(model) | ||
|
|
||
| q_per_world = model.joint_coord_count // model.world_count | ||
| multi_q = multi_q.reshape(model.world_count, q_per_world) | ||
|
|
||
| np.testing.assert_allclose( | ||
| multi_q[0], | ||
| ref_q["A"], | ||
| atol=1e-4, | ||
| err_msg="World 0 (com_A) diverges from single-world reference", | ||
| ) | ||
| np.testing.assert_allclose( | ||
| multi_q[1], | ||
| ref_q["B"], | ||
| atol=1e-4, | ||
| err_msg="World 1 (com_B) diverges from single-world reference", | ||
| ) | ||
|
|
||
|
|
||
| class TestMultiworldBodyProperties(unittest.TestCase): | ||
| """Verify that multi-world simulations with per-world body mass/CoM | ||
| produce physically consistent results across all worlds.""" | ||
|
|
||
| pass | ||
|
|
||
|
|
||
| devices = get_test_devices() | ||
| for device in devices: | ||
| add_function_test( | ||
| TestMultiworldBodyProperties, | ||
|
jsw7460 marked this conversation as resolved.
|
||
| f"test_perworld_com_produces_consistent_physics_{device}", | ||
| test_perworld_com_produces_consistent_physics, | ||
| devices=[device], | ||
| ) | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| unittest.main() | ||
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.
Uh oh!
There was an error while loading. Please reload this page.