Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 30 additions & 20 deletions src/unilab/scripts/train_appo.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,32 @@ def _is_cuda_device(device: str | None) -> bool:
return device is not None and str(device).strip().lower().split(":", 1)[0] == "cuda"


def _env_carrier_device(
cfg: DictConfig,
collector_device: str | None,
*,
runner_device: str | None = None,
) -> str | None:
"""Resolve the process device used by Manager Torch carriers.

The APPO collector owns the environment even when its actor runs on another
accelerator family. An explicit CUDA collector request therefore wins;
otherwise fall back to the runner request. Device auto-detection is handled
separately and must not opt CPU-authoritative HOST_BRIDGE managers into CUDA.
"""
if collector_device is not None and _is_cuda_device(collector_device):
return collector_device
return (
runner_device
if runner_device is not None
else OmegaConf.select(
cfg,
"training.device",
default=None,
)
)


def build_appo_runner_kwargs(
cfg: DictConfig,
env_cfg_override: dict | None,
Expand All @@ -72,20 +98,12 @@ def build_appo_runner_kwargs(
routed_env_cfg_override = apply_backend_env_device_override(
env_cfg_override,
str(cfg.training.sim_backend),
learner_device=(
collector_device
if collector_device is not None and _is_cuda_device(collector_device)
else OmegaConf.select(cfg, "training.device", default=None)
),
learner_device=_env_carrier_device(cfg, collector_device),
)
routed_env_cfg_override = apply_manager_torch_device_override(
routed_env_cfg_override,
str(cfg.training.sim_backend),
learner_device=(
collector_device
if collector_device is not None and _is_cuda_device(collector_device)
else OmegaConf.select(cfg, "training.device", default=None)
),
learner_device=_env_carrier_device(cfg, collector_device),
)

runner_kwargs = {
Expand Down Expand Up @@ -409,20 +427,12 @@ def main(cfg: DictConfig) -> None:
env_cfg_override = apply_backend_env_device_override(
BackendAdapter(cfg, root_dir=Path.cwd(), algo_name="appo").build_task_env_cfg_override(),
str(cfg.training.sim_backend),
learner_device=(
collector_device
if collector_device is not None and _is_cuda_device(collector_device)
else learner_device
),
learner_device=_env_carrier_device(cfg, collector_device, runner_device=learner_device),
)
env_cfg_override = apply_manager_torch_device_override(
env_cfg_override,
str(cfg.training.sim_backend),
learner_device=(
collector_device
if collector_device is not None and _is_cuda_device(collector_device)
else learner_device
),
learner_device=_env_carrier_device(cfg, collector_device, runner_device=learner_device),
)
seed_info = apply_configured_training_seed(cfg, torch_runtime=True, cuda=True)

Expand Down
4 changes: 2 additions & 2 deletions tests/base/test_mjwarp_dr.py
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ def test_low_friction_world_changes_kick_response(backend: Any) -> None:
rows = np.asarray([1, 3], dtype=np.int32)
qpos, qvel = _stand_state(backend, rows.size)
geom_friction = _broadcast_rows(backend.get_geom_friction(), rows.size)
geom_friction[..., 0] = 0.01
geom_friction[..., 0] = 0.1
backend.set_state(
rows,
qpos,
Expand All @@ -405,7 +405,7 @@ def test_low_friction_world_changes_kick_response(backend: Any) -> None:
backend.step(_stand_ctrl(backend), nsteps=3)
assert np.isfinite(backend.get_base_pos()).all()
displacement = np.linalg.norm(backend.get_base_pos()[:, :2] - start, axis=1)
# Near-zero slide friction changes the kick response of the mutated worlds
# Low slide friction changes the kick response of the mutated worlds
# while the default-friction worlds stay pairwise consistent.
assert abs(displacement[1] - displacement[0]) > 0.003
# Same-condition worlds agree up to contact-solver reduction noise.
Expand Down
3 changes: 3 additions & 0 deletions tests/scripts/test_train_script_configs.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ def test_appo_task_configs_load(task, tmp_path):
f"task={task}",
"algo.max_iterations=1",
"training.no_play=true",
# HOST_BRIDGE Torch carriers are opt-in; do not let the smoke test
# vary with the host's accelerator availability.
"training.device=cpu",
*motion_overrides,
],
capture_output=True,
Expand Down
31 changes: 31 additions & 0 deletions tests/scripts/test_train_scripts.py
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,37 @@ def test_build_appo_runner_kwargs_forwards_sim_backend():
assert runner_kwargs["env_cfg_overrides"]["rewards"] == {}


def test_appo_host_bridge_carriers_require_explicit_cuda(monkeypatch):
mod = _train_appo()
cfg = _appo_cfg(["task=g1_motion_tracking/mujoco"])
monkeypatch.setattr(torch.cuda, "is_available", lambda: True)

auto = mod.build_appo_runner_kwargs(cfg, env_cfg_override={}, collector_device=None)
assert "manager_torch_device" not in auto["env_cfg_overrides"]

collector_cpu = mod.build_appo_runner_kwargs(
cfg,
env_cfg_override={},
collector_device="cpu",
)
assert "manager_torch_device" not in collector_cpu["env_cfg_overrides"]

explicit_cpu_cfg = _appo_cfg(["task=g1_motion_tracking/mujoco", "training.device=cpu"])
explicit_cpu = mod.build_appo_runner_kwargs(
explicit_cpu_cfg,
env_cfg_override={},
collector_device=None,
)
assert explicit_cpu["env_cfg_overrides"]["manager_torch_device"] == "cpu"

collector_cuda = mod.build_appo_runner_kwargs(
cfg,
env_cfg_override={},
collector_device="cuda:1",
)
assert collector_cuda["env_cfg_overrides"]["manager_torch_device"] == "cuda:1"


def test_run_motrix_play_loop_runs_without_physics_state():
mod = _train_appo()

Expand Down
Loading