From fbff13d75a3de23af6ea2cdc66afe87b1c6a86d2 Mon Sep 17 00:00:00 2001 From: acrlw <13927622+acrlw@users.noreply.github.com> Date: Mon, 9 Nov 2026 19:43:16 +0800 Subject: [PATCH 1/2] fix(tasks): restore unbounded locomotion actions --- .../velocity/anymal_c_flat/env.newton.yaml | 3 +- .../velocity/anymal_c_flat/env.yaml | 3 +- .../velocity/g1_flat/env.newton.yaml | 3 +- .../locomotion/velocity/g1_flat/env.yaml | 3 +- .../velocity/go1_flat/env.newton.yaml | 3 +- .../locomotion/velocity/go1_flat/env.yaml | 3 +- .../velocity/go2_flat/env.newton.yaml | 3 +- .../locomotion/velocity/go2_flat/env.yaml | 3 +- .../velocity/h1_2_flat/env.newton.yaml | 3 +- .../locomotion/velocity/h1_2_flat/env.yaml | 3 +- .../velocity/microduck_flat/env.newton.yaml | 3 +- .../velocity/microduck_flat/env.yaml | 3 +- .../gym/envs/tasks/test_unitree_locomotion.py | 66 ++++++++++++++++--- 13 files changed, 82 insertions(+), 20 deletions(-) diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/env.newton.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/env.newton.yaml index 7d6d219a45..1c703b7bcc 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/env.newton.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/env.newton.yaml @@ -52,7 +52,8 @@ env: actions: joint_position: contract: joint_position.default_offset@1 - params: {} + params: + clip: null extensions: {} robot: class_type: ANYmalC diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/env.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/env.yaml index c0b9a62e2c..8647a4a49e 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/env.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/env.yaml @@ -39,7 +39,8 @@ env: actions: joint_position: contract: joint_position.default_offset@1 - params: {} + params: + clip: null extensions: {} robot: class_type: ANYmalC diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/env.newton.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/env.newton.yaml index 8a5f4c8afd..08eb55963d 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/env.newton.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/env.newton.yaml @@ -83,7 +83,8 @@ env: actions: joint_position: contract: joint_position.default_offset@1 - params: {} + params: + clip: null extensions: {} robot: class_type: UnitreeG1 diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/env.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/env.yaml index a372fda029..7abaeb43e3 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/env.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/env.yaml @@ -72,7 +72,8 @@ env: actions: joint_position: contract: joint_position.default_offset@1 - params: {} + params: + clip: null extensions: {} robot: class_type: UnitreeG1 diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/env.newton.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/env.newton.yaml index e323eb6293..f5164f40a6 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/env.newton.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/env.newton.yaml @@ -83,7 +83,8 @@ env: actions: joint_position: contract: joint_position.default_offset@1 - params: {} + params: + clip: null extensions: {} robot: class_type: UnitreeGo1 diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/env.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/env.yaml index 9fc0996d32..97b31be6a3 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/env.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/env.yaml @@ -72,7 +72,8 @@ env: actions: joint_position: contract: joint_position.default_offset@1 - params: {} + params: + clip: null extensions: {} robot: class_type: UnitreeGo1 diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/env.newton.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/env.newton.yaml index 1e2b44f795..04499f966c 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/env.newton.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/env.newton.yaml @@ -83,7 +83,8 @@ env: actions: joint_position: contract: joint_position.default_offset@1 - params: {} + params: + clip: null extensions: {} robot: class_type: UnitreeGo2 diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/env.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/env.yaml index bba0c45f87..beb868531e 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/env.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/env.yaml @@ -72,7 +72,8 @@ env: actions: joint_position: contract: joint_position.default_offset@1 - params: {} + params: + clip: null extensions: {} robot: class_type: UnitreeGo2 diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/env.newton.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/env.newton.yaml index 649d693bcf..37640be7a9 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/env.newton.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/env.newton.yaml @@ -83,7 +83,8 @@ env: actions: joint_position: contract: joint_position.default_offset@1 - params: {} + params: + clip: null extensions: {} robot: class_type: UnitreeH1_2 diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/env.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/env.yaml index 81a9ecaca3..6cfc7cccb3 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/env.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/env.yaml @@ -72,7 +72,8 @@ env: actions: joint_position: contract: joint_position.default_offset@1 - params: {} + params: + clip: null extensions: {} robot: class_type: UnitreeH1_2 diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/env.newton.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/env.newton.yaml index 03093f11ff..194542c65e 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/env.newton.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/env.newton.yaml @@ -82,7 +82,8 @@ env: actions: joint_position: contract: joint_position.default_offset@1 - params: {} + params: + clip: null extensions: {} robot: class_type: MicroDuck diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/env.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/env.yaml index 466f845821..f4aba37470 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/env.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/env.yaml @@ -70,7 +70,8 @@ env: actions: joint_position: contract: joint_position.default_offset@1 - params: {} + params: + clip: null extensions: {} robot: class_type: MicroDuck diff --git a/tests/gym/envs/tasks/test_unitree_locomotion.py b/tests/gym/envs/tasks/test_unitree_locomotion.py index 44516ad890..81652d9fca 100644 --- a/tests/gym/envs/tasks/test_unitree_locomotion.py +++ b/tests/gym/envs/tasks/test_unitree_locomotion.py @@ -203,19 +203,43 @@ def test_unitree_deployments_preserve_task_physics( assert config.sensor[0].articulation_cfg_list[0].link_name_list == [] -def test_velocity_env_injects_one_ordered_joint_selector( - monkeypatch: pytest.MonkeyPatch, +@pytest.mark.parametrize("backend", ["default", "newton"]) +@pytest.mark.parametrize( + ("robot", "env_name"), + [ + ("go1", "UnitreeGo1FlatEnv"), + ("go2", "UnitreeGo2FlatEnv"), + ("g1", "UnitreeG1FlatEnv"), + ("h1_2", "UnitreeH12FlatEnv"), + ("anymal_c", "ANYmalCFlatEnv"), + ("microduck", "MicroDuckFlatEnv"), + ], +) +def test_locomotion_env_preserves_ordered_unbounded_joint_actions( + robot: str, env_name: str, backend: str, monkeypatch: pytest.MonkeyPatch ) -> None: - """Runtime locomotion binding must not combine part and joint selectors.""" + """Official task configs preserve policy order and actions outside ±1.""" + from importlib import import_module + from types import SimpleNamespace + from embodichain.lab.gym.envs import EmbodiedEnv + from embodichain.lab.gym.envs.managers.action_manager import ActionManager from embodichain.lab.gym.utils.gym_utils import config_to_cfg from embodichain.lab.sim import cfg as sim_cfg from embodichain.utils.utility import load_config - from embodichain_tasks.locomotion.velocity.go1_flat import UnitreeGo1FlatEnv + + env_type = getattr( + import_module(f"embodichain_tasks.locomotion.velocity.{robot}_flat"), env_name + ) + task = env_type.velocity_task_config monkeypatch.setattr(sim_cfg, "get_data_path", lambda value: value) - path = Path( - "extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/env.yaml" + filename = "env.yaml" if backend == "default" else "env.newton.yaml" + path = ( + Path( + f"extensions/embodichain_tasks/configs/tasks/locomotion/velocity/{robot}_flat" + ) + / filename ) cfg = config_to_cfg( load_config(path), @@ -233,14 +257,40 @@ def capture_init(self, resolved_cfg, **kwargs) -> None: monkeypatch.setattr(EmbodiedEnv, "__init__", capture_init) - UnitreeGo1FlatEnv(cfg) + env_type(cfg) resolved = captured["cfg"] params = resolved.actions.joint_position.params assert "part_name" not in params - assert params["joint_names"] == go1_config.load_config().joint_names + assert params["joint_names"] == task.joint_names assert params["preserve_order"] is True + action_env = SimpleNamespace( + num_envs=2, + device=torch.device("cpu"), + robot=SimpleNamespace( + joint_names=list(task.joint_names), + cfg=SimpleNamespace(init_qpos=task.default_joint_position), + ), + ) + manager = ActionManager( + {"joint_position": resolved.actions.joint_position}, action_env + ) + # Values outside ±1 must reach the calibrated offset-and-scale mapping. + actions = torch.full((2, task.action_dim), 2.0) + actions[1].neg_() + manager.process_action(actions) + + term = manager.get_term("joint_position") + assert torch.isneginf(torch.as_tensor(term.action_space.low)).all() + assert torch.isposinf(torch.as_tensor(term.action_space.high)).all() + torch.testing.assert_close(term.raw_actions, actions) + torch.testing.assert_close( + term.processed_actions, + torch.tensor(task.default_joint_position) + + actions * torch.tensor(task.action_scale), + ) + @pytest.mark.parametrize("backend", ["default", "newton"]) def test_locomotion_keeps_explicit_robot_overrides( From 941c77366cff7de2b911bdd0af308769c4232289 Mon Sep 17 00:00:00 2001 From: acrlw <13927622+acrlw@users.noreply.github.com> Date: Tue, 10 Nov 2026 09:47:57 +0800 Subject: [PATCH 2/2] fix(tasks): pin locomotion DexUni solver defaults --- .../velocity/anymal_c_flat/README.md | 12 ++++++---- .../velocity/anymal_c_flat/catalog.yaml | 2 +- .../velocity/anymal_c_flat/env.newton.yaml | 23 ++++++++++++------- .../locomotion/velocity/g1_flat/README.md | 12 ++++++---- .../locomotion/velocity/g1_flat/catalog.yaml | 2 +- .../velocity/g1_flat/env.newton.yaml | 23 ++++++++++++------- .../locomotion/velocity/go1_flat/README.md | 12 ++++++---- .../locomotion/velocity/go1_flat/catalog.yaml | 2 +- .../velocity/go1_flat/env.newton.yaml | 23 ++++++++++++------- .../locomotion/velocity/go2_flat/README.md | 12 ++++++---- .../locomotion/velocity/go2_flat/catalog.yaml | 2 +- .../velocity/go2_flat/env.newton.yaml | 23 ++++++++++++------- .../locomotion/velocity/h1_2_flat/README.md | 12 ++++++---- .../velocity/h1_2_flat/catalog.yaml | 2 +- .../velocity/h1_2_flat/env.newton.yaml | 23 ++++++++++++------- .../velocity/microduck_flat/README.md | 12 ++++++---- .../velocity/microduck_flat/catalog.yaml | 2 +- .../velocity/microduck_flat/env.newton.yaml | 23 ++++++++++++------- .../envs/tasks/test_locomotion_deployments.py | 19 +++++++++++++++ tests/test_locomotion_catalog.py | 5 +++- 20 files changed, 167 insertions(+), 79 deletions(-) diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/README.md b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/README.md index 57df88f2dd..9044bcdfa6 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/README.md +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/README.md @@ -5,16 +5,20 @@ Gym ID: `ANYmalCFlatRL-v1`. | Deployment | Environment | PPO configuration | |---|---|---| +| `newton` (DexUni, recommended) | [env.newton.yaml](env.newton.yaml) | [agents/ppo.newton.yaml](agents/ppo.newton.yaml) | | `default` (Default) | [env.yaml](env.yaml) | [agents/ppo.yaml](agents/ppo.yaml) | -| `newton` (Newton) | [env.newton.yaml](env.newton.yaml) | [agents/ppo.newton.yaml](agents/ppo.newton.yaml) | Each PPO file's `trainer.gym_config` selects its matching deployment. The -catalog defaults to `default`; backend selection belongs to the environment file. +catalog defaults to `newton`; backend selection belongs to the environment file. +The Newton deployment uses DexUni with dynamic joints and automatic contact +selection. For this rigid articulation scene, DexUni dispatches to MuJoCo Warp +on CUDA (`use_mujoco_cpu: false`). Its MuJoCo settings are explicit, including +20 solver iterations and 50 line-search iterations. Both deployments preserve +unbounded policy actions with `clip: null`. ```bash embodichain show-task embodichain_tasks:anymal_c_flat -embodichain run-task --gym_config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/env.yaml -embodichain train-rl --config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/agents/ppo.yaml +embodichain run-task --gym_config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/env.newton.yaml embodichain train-rl --config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/agents/ppo.newton.yaml ``` diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/catalog.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/catalog.yaml index 850ed8ab4f..aa87ebb50c 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/catalog.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/catalog.yaml @@ -5,7 +5,7 @@ tags: - locomotion - reinforcement_learning - quadruped -default_deployment: default +default_deployment: newton deployments: default: config: env.yaml diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/env.newton.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/env.newton.yaml index 1c703b7bcc..9d7842f943 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/env.newton.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/anymal_c_flat/env.newton.yaml @@ -14,14 +14,21 @@ physics_config: - -9.81 num_substeps: 1 solver_cfg: - solver_type: mujoco_warp - njmax: 1024 - nconmax: 256 - iterations: 10 - ls_iterations: 50 - integrator: implicitfast - separate_worlds: true - tolerance: 1.0e-08 + solver_type: dexuni + joint_mode: dynamic + contact_mode: auto + mujoco_options: + njmax: 1024 + nconmax: 256 + iterations: 20 + ls_iterations: 50 + integrator: implicitfast + separate_worlds: true + tolerance: 1.0e-08 + cone: pyramidal + impratio: 1.0 + ls_parallel: false + use_mujoco_cpu: false physics_dt: 0.005 env: sim_steps_per_control: 4 diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/README.md b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/README.md index a829c82d15..22521d2f4b 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/README.md +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/README.md @@ -5,16 +5,20 @@ Gym ID: `UnitreeG1FlatRL-v1`. | Deployment | Environment | PPO configuration | |---|---|---| +| `newton` (DexUni, recommended) | [env.newton.yaml](env.newton.yaml) | [agents/ppo.newton.yaml](agents/ppo.newton.yaml) | | `default` (Default) | [env.yaml](env.yaml) | [agents/ppo.yaml](agents/ppo.yaml) | -| `newton` (Newton) | [env.newton.yaml](env.newton.yaml) | [agents/ppo.newton.yaml](agents/ppo.newton.yaml) | Each PPO file's `trainer.gym_config` selects its matching deployment. The -catalog defaults to `default`; backend selection belongs to the environment file. +catalog defaults to `newton`; backend selection belongs to the environment file. +The Newton deployment uses DexUni with dynamic joints and automatic contact +selection. For this rigid articulation scene, DexUni dispatches to MuJoCo Warp +on CUDA (`use_mujoco_cpu: false`). Its MuJoCo settings are explicit, including +20 solver iterations and 50 line-search iterations. Both deployments preserve +unbounded policy actions with `clip: null`. ```bash embodichain show-task embodichain_tasks:g1_flat -embodichain run-task --gym_config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/env.yaml -embodichain train-rl --config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/agents/ppo.yaml +embodichain run-task --gym_config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/env.newton.yaml embodichain train-rl --config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/agents/ppo.newton.yaml ``` diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/catalog.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/catalog.yaml index 8325b398bd..e8870e8586 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/catalog.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/catalog.yaml @@ -5,7 +5,7 @@ tags: - locomotion - reinforcement_learning - humanoid -default_deployment: default +default_deployment: newton deployments: default: config: env.yaml diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/env.newton.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/env.newton.yaml index 08eb55963d..84dfec3a63 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/env.newton.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/g1_flat/env.newton.yaml @@ -15,14 +15,21 @@ physics_config: - -9.81 num_substeps: 1 solver_cfg: - solver_type: mujoco_warp - njmax: 1024 - nconmax: 256 - iterations: 20 - ls_iterations: 50 - integrator: implicitfast - separate_worlds: true - tolerance: 1.0e-08 + solver_type: dexuni + joint_mode: dynamic + contact_mode: auto + mujoco_options: + njmax: 1024 + nconmax: 256 + iterations: 20 + ls_iterations: 50 + integrator: implicitfast + separate_worlds: true + tolerance: 1.0e-08 + cone: pyramidal + impratio: 1.0 + ls_parallel: false + use_mujoco_cpu: false physics_dt: 0.005 env: sim_steps_per_control: 4 diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/README.md b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/README.md index 5d7ce43ac7..a4e83b4b18 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/README.md +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/README.md @@ -5,16 +5,20 @@ Gym ID: `UnitreeGo1FlatRL-v1`. | Deployment | Environment | PPO configuration | |---|---|---| +| `newton` (DexUni, recommended) | [env.newton.yaml](env.newton.yaml) | [agents/ppo.newton.yaml](agents/ppo.newton.yaml) | | `default` (Default) | [env.yaml](env.yaml) | [agents/ppo.yaml](agents/ppo.yaml) | -| `newton` (Newton) | [env.newton.yaml](env.newton.yaml) | [agents/ppo.newton.yaml](agents/ppo.newton.yaml) | Each PPO file's `trainer.gym_config` selects its matching deployment. The -catalog defaults to `default`; backend selection belongs to the environment file. +catalog defaults to `newton`; backend selection belongs to the environment file. +The Newton deployment uses DexUni with dynamic joints and automatic contact +selection. For this rigid articulation scene, DexUni dispatches to MuJoCo Warp +on CUDA (`use_mujoco_cpu: false`). Its MuJoCo settings are explicit, including +20 solver iterations and 50 line-search iterations. Both deployments preserve +unbounded policy actions with `clip: null`. ```bash embodichain show-task embodichain_tasks:go1_flat -embodichain run-task --gym_config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/env.yaml -embodichain train-rl --config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/agents/ppo.yaml +embodichain run-task --gym_config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/env.newton.yaml embodichain train-rl --config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/agents/ppo.newton.yaml ``` diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/catalog.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/catalog.yaml index d642817274..19a9169d6f 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/catalog.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/catalog.yaml @@ -5,7 +5,7 @@ tags: - locomotion - reinforcement_learning - quadruped -default_deployment: default +default_deployment: newton deployments: default: config: env.yaml diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/env.newton.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/env.newton.yaml index f5164f40a6..0255da6420 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/env.newton.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go1_flat/env.newton.yaml @@ -15,14 +15,21 @@ physics_config: - -9.81 num_substeps: 1 solver_cfg: - solver_type: mujoco_warp - njmax: 1024 - nconmax: 256 - iterations: 10 - ls_iterations: 50 - integrator: implicitfast - separate_worlds: true - tolerance: 1.0e-08 + solver_type: dexuni + joint_mode: dynamic + contact_mode: auto + mujoco_options: + njmax: 1024 + nconmax: 256 + iterations: 20 + ls_iterations: 50 + integrator: implicitfast + separate_worlds: true + tolerance: 1.0e-08 + cone: pyramidal + impratio: 1.0 + ls_parallel: false + use_mujoco_cpu: false physics_dt: 0.005 env: sim_steps_per_control: 4 diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/README.md b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/README.md index da51178052..3259acea06 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/README.md +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/README.md @@ -5,16 +5,20 @@ Gym ID: `UnitreeGo2FlatRL-v1`. | Deployment | Environment | PPO configuration | |---|---|---| +| `newton` (DexUni, recommended) | [env.newton.yaml](env.newton.yaml) | [agents/ppo.newton.yaml](agents/ppo.newton.yaml) | | `default` (Default) | [env.yaml](env.yaml) | [agents/ppo.yaml](agents/ppo.yaml) | -| `newton` (Newton) | [env.newton.yaml](env.newton.yaml) | [agents/ppo.newton.yaml](agents/ppo.newton.yaml) | Each PPO file's `trainer.gym_config` selects its matching deployment. The -catalog defaults to `default`; backend selection belongs to the environment file. +catalog defaults to `newton`; backend selection belongs to the environment file. +The Newton deployment uses DexUni with dynamic joints and automatic contact +selection. For this rigid articulation scene, DexUni dispatches to MuJoCo Warp +on CUDA (`use_mujoco_cpu: false`). Its MuJoCo settings are explicit, including +20 solver iterations and 50 line-search iterations. Both deployments preserve +unbounded policy actions with `clip: null`. ```bash embodichain show-task embodichain_tasks:go2_flat -embodichain run-task --gym_config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/env.yaml -embodichain train-rl --config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/agents/ppo.yaml +embodichain run-task --gym_config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/env.newton.yaml embodichain train-rl --config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/agents/ppo.newton.yaml ``` diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/catalog.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/catalog.yaml index 51c84a15c8..51d2ec8852 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/catalog.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/catalog.yaml @@ -5,7 +5,7 @@ tags: - locomotion - reinforcement_learning - quadruped -default_deployment: default +default_deployment: newton deployments: default: config: env.yaml diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/env.newton.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/env.newton.yaml index 04499f966c..d868e1eab7 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/env.newton.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/go2_flat/env.newton.yaml @@ -15,14 +15,21 @@ physics_config: - -9.81 num_substeps: 1 solver_cfg: - solver_type: mujoco_warp - njmax: 1024 - nconmax: 256 - iterations: 10 - ls_iterations: 50 - integrator: implicitfast - separate_worlds: true - tolerance: 1.0e-08 + solver_type: dexuni + joint_mode: dynamic + contact_mode: auto + mujoco_options: + njmax: 1024 + nconmax: 256 + iterations: 20 + ls_iterations: 50 + integrator: implicitfast + separate_worlds: true + tolerance: 1.0e-08 + cone: pyramidal + impratio: 1.0 + ls_parallel: false + use_mujoco_cpu: false physics_dt: 0.005 env: sim_steps_per_control: 4 diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/README.md b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/README.md index 6f62f0a5e5..b6413fb0ea 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/README.md +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/README.md @@ -5,16 +5,20 @@ Gym ID: `UnitreeH1_2FlatRL-v1`. | Deployment | Environment | PPO configuration | |---|---|---| +| `newton` (DexUni, recommended) | [env.newton.yaml](env.newton.yaml) | [agents/ppo.newton.yaml](agents/ppo.newton.yaml) | | `default` (Default) | [env.yaml](env.yaml) | [agents/ppo.yaml](agents/ppo.yaml) | -| `newton` (Newton) | [env.newton.yaml](env.newton.yaml) | [agents/ppo.newton.yaml](agents/ppo.newton.yaml) | Each PPO file's `trainer.gym_config` selects its matching deployment. The -catalog defaults to `default`; backend selection belongs to the environment file. +catalog defaults to `newton`; backend selection belongs to the environment file. +The Newton deployment uses DexUni with dynamic joints and automatic contact +selection. For this rigid articulation scene, DexUni dispatches to MuJoCo Warp +on CUDA (`use_mujoco_cpu: false`). Its MuJoCo settings are explicit, including +20 solver iterations and 50 line-search iterations. Both deployments preserve +unbounded policy actions with `clip: null`. ```bash embodichain show-task embodichain_tasks:h1_2_flat -embodichain run-task --gym_config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/env.yaml -embodichain train-rl --config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/agents/ppo.yaml +embodichain run-task --gym_config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/env.newton.yaml embodichain train-rl --config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/agents/ppo.newton.yaml ``` diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/catalog.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/catalog.yaml index 350ab4dc6a..f92216ff04 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/catalog.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/catalog.yaml @@ -5,7 +5,7 @@ tags: - locomotion - reinforcement_learning - humanoid -default_deployment: default +default_deployment: newton deployments: default: config: env.yaml diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/env.newton.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/env.newton.yaml index 37640be7a9..0805ae6d22 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/env.newton.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/h1_2_flat/env.newton.yaml @@ -15,14 +15,21 @@ physics_config: - -9.81 num_substeps: 1 solver_cfg: - solver_type: mujoco_warp - njmax: 1024 - nconmax: 256 - iterations: 10 - ls_iterations: 50 - integrator: implicitfast - separate_worlds: true - tolerance: 1.0e-08 + solver_type: dexuni + joint_mode: dynamic + contact_mode: auto + mujoco_options: + njmax: 1024 + nconmax: 256 + iterations: 20 + ls_iterations: 50 + integrator: implicitfast + separate_worlds: true + tolerance: 1.0e-08 + cone: pyramidal + impratio: 1.0 + ls_parallel: false + use_mujoco_cpu: false physics_dt: 0.005 env: sim_steps_per_control: 4 diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/README.md b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/README.md index bf1219ed71..5ac8497754 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/README.md +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/README.md @@ -5,16 +5,20 @@ Gym ID: `MicroDuckFlatRL-v1`. | Deployment | Environment | PPO configuration | |---|---|---| +| `newton` (DexUni, recommended) | [env.newton.yaml](env.newton.yaml) | [agents/ppo.newton.yaml](agents/ppo.newton.yaml) | | `default` (Default) | [env.yaml](env.yaml) | [agents/ppo.yaml](agents/ppo.yaml) | -| `newton` (Newton) | [env.newton.yaml](env.newton.yaml) | [agents/ppo.newton.yaml](agents/ppo.newton.yaml) | Each PPO file's `trainer.gym_config` selects its matching deployment. The -catalog defaults to `default`; backend selection belongs to the environment file. +catalog defaults to `newton`; backend selection belongs to the environment file. +The Newton deployment uses DexUni with dynamic joints and automatic contact +selection. For this rigid articulation scene, DexUni dispatches to MuJoCo Warp +on CUDA (`use_mujoco_cpu: false`). Its MuJoCo settings are explicit, including +20 solver iterations and 50 line-search iterations. Both deployments preserve +unbounded policy actions with `clip: null`. ```bash embodichain show-task embodichain_tasks:microduck_flat -embodichain run-task --gym_config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/env.yaml -embodichain train-rl --config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/agents/ppo.yaml +embodichain run-task --gym_config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/env.newton.yaml embodichain train-rl --config extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/agents/ppo.newton.yaml ``` diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/catalog.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/catalog.yaml index fc05056131..1252fc15f7 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/catalog.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/catalog.yaml @@ -5,7 +5,7 @@ tags: - locomotion - reinforcement_learning - biped -default_deployment: default +default_deployment: newton deployments: default: config: env.yaml diff --git a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/env.newton.yaml b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/env.newton.yaml index 194542c65e..92e59ad053 100644 --- a/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/env.newton.yaml +++ b/extensions/embodichain_tasks/configs/tasks/locomotion/velocity/microduck_flat/env.newton.yaml @@ -14,14 +14,21 @@ physics_config: - -9.81 num_substeps: 1 solver_cfg: - solver_type: mujoco_warp - njmax: 1024 - nconmax: 256 - iterations: 10 - ls_iterations: 50 - integrator: implicitfast - separate_worlds: true - tolerance: 1.0e-08 + solver_type: dexuni + joint_mode: dynamic + contact_mode: auto + mujoco_options: + njmax: 1024 + nconmax: 256 + iterations: 20 + ls_iterations: 50 + integrator: implicitfast + separate_worlds: true + tolerance: 1.0e-08 + cone: pyramidal + impratio: 1.0 + ls_parallel: false + use_mujoco_cpu: false physics_dt: 0.002 env: sim_steps_per_control: 10 diff --git a/tests/gym/envs/tasks/test_locomotion_deployments.py b/tests/gym/envs/tasks/test_locomotion_deployments.py index 8aae4154d2..3a574de107 100644 --- a/tests/gym/envs/tasks/test_locomotion_deployments.py +++ b/tests/gym/envs/tasks/test_locomotion_deployments.py @@ -150,6 +150,25 @@ def test_packaged_deployment_and_agent_config_agree( * agent["trainer"]["buffer_size"] // algorithm["num_mini_batches"] ) + if backend == "newton": + solver = cfg.sim_cfg.physics_cfg.to_dexsim_cfg(gpu_id=0).solver_cfg + assert solver.solver_type == "dexuni" + assert solver.joint_mode == "dynamic" + assert solver.contact_mode == "auto" + # Match the MuJoCo Warp settings used by the locomotion training runs. + assert solver.mujoco_options == { + "njmax": 1024, + "nconmax": 256, + "iterations": 20, + "ls_iterations": 50, + "integrator": "implicitfast", + "separate_worlds": True, + "tolerance": 1.0e-8, + "cone": "pyramidal", + "impratio": 1.0, + "ls_parallel": False, + "use_mujoco_cpu": False, + } else: assert agent["trainer"]["renderer"] == cfg.sim_cfg.render_cfg.renderer assert Path(agent["trainer"]["gym_config"]).resolve() == path.resolve() diff --git a/tests/test_locomotion_catalog.py b/tests/test_locomotion_catalog.py index 0a89bc1e49..5bf8e1a24e 100644 --- a/tests/test_locomotion_catalog.py +++ b/tests/test_locomotion_catalog.py @@ -50,7 +50,9 @@ def test_locomotion_deployments_resolve_matching_ppo( locomotion_catalog: list, task_path: str ) -> None: task = catalog._select_task(locomotion_catalog, Path(task_path).name) - assert task.default_deployment == "default" + assert task.default_deployment == ( + "newton" if task_path.startswith("locomotion/") else "default" + ) assert task.readme == _CONFIG_ROOT / task_path / "README.md" assert task.readme.is_file() assert {deployment.name for deployment in task.deployments} == {"default", "newton"} @@ -85,6 +87,7 @@ def test_locomotion_details_and_gallery( ) detail = capsys.readouterr().out assert task.title in detail and task.title in gallery + assert f"Default deployment: {task.default_deployment}" in detail assert detail.count("Supported uses: RL") == 2 assert detail.count("Qualification: unavailable") == 2 assert task.readme.as_uri() in gallery