From 39e1eec90a59d47b6a98ed21ecbb4ce15643f8b5 Mon Sep 17 00:00:00 2001 From: TATP-233 Date: Thu, 19 Nov 2026 23:47:03 +0800 Subject: [PATCH] refactor!: drop zero-consumer public surface from the issue #2629 YAGNI sweep Immediate action (docs): - Fix the crawl-slope WBT example that recommended sampling_mode=start (unsupported by the tensor sampler; raises NotImplementedError at env construction): use sampling_mode=mixed with sampling_start_ratio=1.0, the supported deterministic clip-start form, in both en and zh_CN pages. - Narrow MotionCommandCfg.sampling_mode to Literal["adaptive", "mixed"] so invalid values fail at config validation. High-confidence deletions, batch 1 (zero in-repo consumers): - managers: clear_finite_verdict x3, TerminationManager.dones/get_term, RecorderManager.__contains__ (and Null), DelayBuffer.set_lags, apply_cuda_process_sharing_manifest, get_hydra_runtime_choice. - base: EnvConfigAdapter algo_name (silently ignored; all call sites cleaned, including build_play_backend_adapter), registry.find_available_sim_backend (make() already inlines the fallback). - envs/tasks: UniformVelocityCommandCfg VizCfg/viz, BaseActionCfg.preserve_order, MotionLoader.get_clip_indices, resolve_checkpoint_file Sequence[str] branch. - rl: resolve_torch_device_alias group in rl.runtime.device, build_actor num_envs (silently ignored). - conf: PPO algo.experiment_name/run_name, SAC algo.actor: {} fake-compat key, motion-tracking owner YAML lines that only restate dataclass defaults. High-confidence deletions, batch 2 (issue comments: downstream audit upgraded all maintainer-decision items): - UniformVelocityCommandCfg.init_velocity_prob fake knob (8 owner YAML lines removed; downstream repos must drop their init_velocity_prob: 0.0 lines on upgrade, tracked in the issue). - EnvAlgoCapabilities action_low/action_high/joint_names reserved fields. - Tensor-migration leftovers: motion_tracking/common/tensor_runtime.py, tensor_state_store.py (DeviceStateStore), locomotion/go2/tensor_parity.py; ADR-0011/0012 evidence pointers updated. - PPO owner algo.resume/algo.resume_path dead keys; the PPO entrypoint fails closed via reject_removed_ppo_resume_keys (resume stays on algo.load_run + algo.checkpoint; off-policy owners keep the live keys). - TorchEnv.record_finite_validation label argument (silently dropped). - Tests-only debug surface: ManagerBase.get_active_iterable_terms and implementations, extract_reset_obs, render_play_mode and run_native_viewer_play_loop thin wrappers (callers use env.run_playback directly), OnPolicyLogger (with its api_reference entry). TorchEnv.require is kept: it is the live deferred mask-check sink installed by ManagerBasedRlEnv for masked autoreset. - Zero-consumer noise cfgs ConstantNoiseCfg/GaussianNoiseCfg/ SegmentwiseUniformNoiseCfg (UniformNoiseCfg and the NoiseModel extension base stay). Validation: make check; make test (2946 passed, 67 skipped). --- ...R-0011-torch-only-manager-based-runtime.md | 7 +- ...sole-tensor-manager-and-scoped-backends.md | 6 +- .../source/api_reference/logging/index.md | 5 +- docs/sphinx/source/changelog.md | 92 ++++ .../2-user_guide/4-tasks/2-motion_tracking.md | 10 +- .../2-user_guide/4-tasks/2-motion_tracking.md | 8 +- .../benchmark/benchmark_drake_performance.py | 1 - scripts/benchmark/env/benchmark_env_step.py | 1 - .../env/benchmark_env_step_phase_cpu.py | 4 +- .../benchmark_offpolicy_collector_active.py | 1 - .../rl/benchmark_replay_buffer_placement.py | 1 - .../benchmark_sac_replay_buffer_sampling.py | 1 - .../torch_env/g1_flashsac_backend.py | 4 +- scripts/visualize_task_env.py | 7 +- src/unilab/assets/hub.py | 17 +- src/unilab/base/config_adapter.py | 2 - src/unilab/base/contracts/env.py | 18 - src/unilab/base/entity.py | 6 +- src/unilab/base/registry.py | 12 - src/unilab/base/torch_env.py | 9 +- .../appo/task/g1_motion_tracking/base.yaml | 3 - .../conf/appo/task/g1_walk_flat/base.yaml | 1 - .../appo/task/go2_joystick_flat/base.yaml | 1 - .../task/g1_motion_tracking/base.yaml | 3 - .../conf/flashsac/task/g1_walk_flat/base.yaml | 1 - .../flashsac/task/go2_joystick_flat/base.yaml | 1 - src/unilab/conf/ppo/config.yaml | 3 - .../ppo/task/g1_motion_tracking/base.yaml | 3 - .../conf/ppo/task/g1_walk_flat/base.yaml | 1 - .../conf/ppo/task/go2_joystick_flat/base.yaml | 1 - src/unilab/conf/sac/config.yaml | 1 - .../sac/task/g1_motion_tracking/base.yaml | 3 - .../conf/sac/task/g1_walk_flat/base.yaml | 1 - .../conf/sac/task/go2_joystick_flat/base.yaml | 1 - src/unilab/envs/manager_based_rl_env.py | 10 +- src/unilab/envs/mdp/actions/actions.py | 1 - .../envs/mdp/commands/velocity_command.py | 14 - src/unilab/envs/mdp/observations.py | 2 +- src/unilab/envs/mdp/terminations.py | 2 +- src/unilab/managers/__init__.py | 5 - src/unilab/managers/_buffers/delay_buffer.py | 15 - src/unilab/managers/_noise/__init__.py | 5 - src/unilab/managers/_noise/noise_cfg.py | 128 ----- src/unilab/managers/action_manager.py | 12 - src/unilab/managers/command_manager.py | 18 +- src/unilab/managers/curriculum_manager.py | 22 - src/unilab/managers/manager_base.py | 4 - src/unilab/managers/metrics_manager.py | 9 - src/unilab/managers/observation_manager.py | 36 -- src/unilab/managers/recorder_manager.py | 9 - src/unilab/managers/reward_manager.py | 11 +- src/unilab/managers/termination_manager.py | 14 - src/unilab/managers/types.py | 2 +- src/unilab/rl/algos/common/actor_factory.py | 1 - src/unilab/rl/logging/__init__.py | 2 - src/unilab/rl/logging/metric_schema.py | 5 +- src/unilab/rl/logging/onpolicy.py | 270 ---------- src/unilab/rl/runtime/device.py | 99 +--- src/unilab/scripts/play_interactive.py | 2 +- src/unilab/scripts/train_appo.py | 4 +- src/unilab/scripts/train_rsl_rl.py | 4 +- src/unilab/structured_configs.py | 6 - .../tasks/locomotion/go2/tensor_parity.py | 440 ---------------- .../motion_tracking/common/manager_terms.py | 4 +- .../motion_tracking/common/motion_loader.py | 5 - .../motion_tracking/common/tensor_runtime.py | 211 -------- .../common/tensor_state_store.py | 334 ------------ src/unilab/training/__init__.py | 2 - src/unilab/training/common.py | 17 - src/unilab/training/cuda_process_sharing.py | 10 - src/unilab/training/run.py | 20 + src/unilab/visualization/__init__.py | 4 +- .../visualization/interactive_playback.py | 16 +- src/unilab/visualization/playback.py | 75 +-- tests/base/contracts/test_env.py | 19 +- tests/base/test_mjwarp_backend.py | 2 - tests/base/test_registry.py | 24 +- tests/base/test_torch_env.py | 2 +- .../locomotion/g1/test_g1_owner_contract.py | 2 +- tests/envs/mdp/test_terminations.py | 9 +- .../envs/mdp/test_uniform_velocity_command.py | 1 - tests/envs/test_env_configs.py | 7 +- tests/envs/test_manager_based_rl_env.py | 3 - tests/envs/test_observation_partial_reset.py | 4 +- tests/managers/test_core_managers.py | 24 +- tests/managers/test_device_contracts.py | 14 +- .../test_observation_buffers_noise.py | 122 +---- tests/rl/logging/test_offpolicy_logger.py | 109 ---- tests/rl/runtime/test_device.py | 112 +--- tests/scripts/test_train_scripts.py | 32 +- tests/tasks/test_g1_motion_fixed_shape.py | 4 +- tests/tasks/test_go2_tensor_runtime.py | 469 ----------------- tests/tasks/test_tensor_runtime_components.py | 498 ------------------ tests/training/test_training_helpers.py | 45 +- tests/utils/test_experiment_tracking.py | 91 +--- .../test_interactive_playback.py | 3 +- tests/visualization/test_playback_session.py | 5 +- 97 files changed, 258 insertions(+), 3429 deletions(-) delete mode 100644 src/unilab/rl/logging/onpolicy.py delete mode 100644 src/unilab/tasks/locomotion/go2/tensor_parity.py delete mode 100644 src/unilab/tasks/motion_tracking/common/tensor_runtime.py delete mode 100644 src/unilab/tasks/motion_tracking/common/tensor_state_store.py delete mode 100644 tests/tasks/test_go2_tensor_runtime.py delete mode 100644 tests/tasks/test_tensor_runtime_components.py diff --git a/docs/sphinx/source/adr/ADR-0011-torch-only-manager-based-runtime.md b/docs/sphinx/source/adr/ADR-0011-torch-only-manager-based-runtime.md index 9b201ffdd..3b098a1e2 100644 --- a/docs/sphinx/source/adr/ADR-0011-torch-only-manager-based-runtime.md +++ b/docs/sphinx/source/adr/ADR-0011-torch-only-manager-based-runtime.md @@ -226,8 +226,11 @@ superseded ADR-0006 may remain. ## Evidence In Repo -- Reusable tensor components: `src/unilab/tasks/motion_tracking/common/tensor_runtime.py`, - `src/unilab/tasks/motion_tracking/common/tensor_state_store.py` +- The reusable tensor component helpers once cited here + (`src/unilab/tasks/motion_tracking/common/tensor_runtime.py`, + `src/unilab/tasks/motion_tracking/common/tensor_state_store.py`) had no + production consumer once the Manager runtime became device-native; they + were removed in the YAGNI sweep for issue #2629. - General Manager runtime to migrate: `src/unilab/envs/manager_based_rl_env.py` - Legacy runtime: removed. The historical path `src/unilab/base/np_env.py` no longer exists and is intentionally not cited diff --git a/docs/sphinx/source/adr/ADR-0012-sole-tensor-manager-and-scoped-backends.md b/docs/sphinx/source/adr/ADR-0012-sole-tensor-manager-and-scoped-backends.md index 454f24fa7..0f031a8bf 100644 --- a/docs/sphinx/source/adr/ADR-0012-sole-tensor-manager-and-scoped-backends.md +++ b/docs/sphinx/source/adr/ADR-0012-sole-tensor-manager-and-scoped-backends.md @@ -218,8 +218,10 @@ useful for launcher/debug/MPS isolation. ## Evidence In Repo - Manager runtime: `src/unilab/envs/manager_based_rl_env.py` -- Tensor state store/readiness consumer: - `src/unilab/tasks/motion_tracking/common/tensor_state_store.py` +- The tensor state store once cited here + (`src/unilab/tasks/motion_tracking/common/tensor_state_store.py`) had no + production consumer once the Manager runtime became device-native; it was + removed in the YAGNI sweep for issue #2629. - Public backend contract: `unisim.backend.base.SimBackend` - Current tensor Manager backend scope: `src/unilab/base/registry.py` (`_SUPPORTED_SIM_BACKENDS`, diff --git a/docs/sphinx/source/api_reference/logging/index.md b/docs/sphinx/source/api_reference/logging/index.md index 04d86f65a..bd6e31b02 100644 --- a/docs/sphinx/source/api_reference/logging/index.md +++ b/docs/sphinx/source/api_reference/logging/index.md @@ -2,6 +2,5 @@ The W&B / TensorBoard bridges and structured training loggers live in the `unilab` distribution under `unilab.rl.logging` (the former `uni_rl.logging` -is merged into this repository; issue #2372): `OnPolicyLogger`, -`OffPolicyLogger`, the metric and runtime-manifest schemas, and the -trace-event recorder. +is merged into this repository; issue #2372): `OffPolicyLogger`, +the metric and runtime-manifest schemas, and the trace-event recorder. diff --git a/docs/sphinx/source/changelog.md b/docs/sphinx/source/changelog.md index 152c9a3c3..30e852dbd 100644 --- a/docs/sphinx/source/changelog.md +++ b/docs/sphinx/source/changelog.md @@ -207,6 +207,22 @@ PyPI 版本变更与未发布变更;发布日期采用 PyPI 上传日期。完 的模式相矛盾。该方法现在免同步;调用方需自行保证概率有限、非负且和为正, 方法 docstring 已注明 ([#2624](https://github.com/Motphys/UniLab/issues/2624))。 +- The crawl-slope WBT example in the motion-tracking task guide no longer + recommends `sampling_mode=start`, which the tensor sampler has never + supported (it raises `NotImplementedError` at env construction). The example + now uses `sampling_mode=mixed` with `sampling_start_ratio=1.0`, the + supported deterministic clip-start form, in both the English and Chinese + pages; `MotionCommandCfg.sampling_mode` is narrowed to + `Literal["adaptive", "mixed"]` so invalid values are rejected by config + validation with a clear error instead of failing deep inside the tensor + sampler ([#2629](https://github.com/Motphys/UniLab/issues/2629)). + motion-tracking 任务指南中的 crawl-slope WBT 示例不再推荐 + `sampling_mode=start`(tensor sampler 从未支持该值,会在 env 构造期抛 + `NotImplementedError`)。示例改用受支持的确定性 clip 起点形式 + `sampling_mode=mixed` 加 `sampling_start_ratio=1.0`,中英文页面同步修正; + `MotionCommandCfg.sampling_mode` 收窄为 `Literal["adaptive", "mixed"]`, + 非法值在配置校验处即被清晰拒绝,不再深入 tensor sampler 才失败 + ([#2629](https://github.com/Motphys/UniLab/issues/2629))。 ### Removed / 移除 @@ -225,6 +241,82 @@ PyPI 版本变更与未发布变更;发布日期采用 PyPI 上传日期。完 或用 `None` 表示全部行。保留形式为 `None`、一维整数行索引张量与内部 `ResetSelection` 协议;不留 deprecation 别名 ([#2619](https://github.com/Motphys/UniLab/issues/2619))。 +- Remove zero-consumer public surface identified by the repo-wide YAGNI scan + ([#2629](https://github.com/Motphys/UniLab/issues/2629)): the + `clear_finite_verdict` alias on the observation/action/reward managers, + `TerminationManager.dones` / `TerminationManager.get_term`, + `RecorderManager.__contains__` (and the Null variant), `DelayBuffer.set_lags`, + `apply_cuda_process_sharing_manifest`, `get_hydra_runtime_choice` (and its + `unilab.training` re-export), `registry.find_available_sim_backend`, + `MotionLoader.get_clip_indices`, the `VizCfg`/`viz` field on + `UniformVelocityCommandCfg`, `BaseActionCfg.preserve_order`, the + `Sequence[str]` branch of `resolve_checkpoint_file`, the + `resolve_torch_device_alias` group in `rl.runtime.device`, the ignored + `num_envs` parameter of `build_actor`, and the silently ignored `algo_name` + parameter of `EnvConfigAdapter` (its forwarding parameter on + `build_play_backend_adapter` is removed as well). Owner YAML cleanup: drop + the never-consumed PPO `algo.experiment_name` / `algo.run_name` and the SAC + `algo.actor: {}` fake-compat key, plus motion-tracking owner YAML lines that + only restate dataclass defaults (`sampling_start_ratio`, `joint_position_range`, + `joint_default_position_range`). + 删除全仓 YAGNI 扫描确认的零消费公共面 + ([#2629](https://github.com/Motphys/UniLab/issues/2629)):observation / + action / reward manager 上的 `clear_finite_verdict` 别名、 + `TerminationManager.dones` / `TerminationManager.get_term`、 + `RecorderManager.__contains__`(含 Null 版)、`DelayBuffer.set_lags`、 + `apply_cuda_process_sharing_manifest`、`get_hydra_runtime_choice`(及其 + `unilab.training` re-export)、`registry.find_available_sim_backend`、 + `MotionLoader.get_clip_indices`、`UniformVelocityCommandCfg` 上的 + `VizCfg`/`viz` 字段、`BaseActionCfg.preserve_order`、 + `resolve_checkpoint_file` 的 `Sequence[str]` 分支、`rl.runtime.device` 中的 + `resolve_torch_device_alias` 整组、`build_actor` 被静默忽略的 `num_envs` + 参数,以及 `EnvConfigAdapter` 被静默忽略的 `algo_name` 参数(其转发参数 + `build_play_backend_adapter.algo_name` 一并移除)。owner YAML 清理:删除 + 从未被消费的 PPO `algo.experiment_name` / `algo.run_name` 与 SAC + `algo.actor: {}` 假兼容键,以及仅重复 dataclass 默认值的 motion-tracking + owner YAML 行(`sampling_start_ratio`、`joint_position_range`、 + `joint_default_position_range`)。 +- Second YAGNI batch from the downstream-ecosystem audit in issue #2629 (all + previously "maintainer decision" items, now confirmed deletable): the + `init_velocity_prob` fake knob on `UniformVelocityCommandCfg` (all eight + owner YAML lines removed; the five downstream repos that still write + `init_velocity_prob: 0.0` must drop those lines on upgrade, tracked in the + issue), the never-consumed `action_low` / `action_high` / `joint_names` + reserved fields on `EnvAlgoCapabilities`, the tensor-migration leftovers + `motion_tracking/common/tensor_runtime.py`, + `motion_tracking/common/tensor_state_store.py` (`DeviceStateStore`), and + `locomotion/go2/tensor_parity.py` (ADR-0011/0012 evidence pointers updated), + the PPO-owner `algo.resume` / `algo.resume_path` dead keys (the PPO + entrypoint now fails closed via `reject_removed_ppo_resume_keys`; PPO + resume stays on `algo.load_run` + `algo.checkpoint`; the off-policy owners + still own the live keys), the silently dropped `label` argument of + `TorchEnv.record_finite_validation`, the tests-only debug surface + (`ManagerBase.get_active_iterable_terms` and its manager implementations, + `extract_reset_obs`, the `render_play_mode` and + `run_native_viewer_play_loop` thin wrappers — callers use + `env.run_playback` directly — and `OnPolicyLogger` with its api_reference + entry), and the zero-consumer noise cfgs `ConstantNoiseCfg`, + `GaussianNoiseCfg`, and `SegmentwiseUniformNoiseCfg` (`UniformNoiseCfg` and + the `NoiseModel` extension base stay). + issue #2629 下游生态审计复核后的第二批 YAGNI 删除(原"维护者决策"项全部 + 转删除):`UniformVelocityCommandCfg` 的假旋钮 `init_velocity_prob`(8 个 + owner YAML 行同步删除;5 个下游仓库仍需在升级时删掉各自 YAML 中的 + `init_velocity_prob: 0.0`,见 issue 跟踪);`EnvAlgoCapabilities` 上从未被 + 消费的预留字段 `action_low` / `action_high` / `joint_names`;tensor 迁移 + 遗留三模块(`motion_tracking/common/tensor_runtime.py`、 + `motion_tracking/common/tensor_state_store.py` 的 `DeviceStateStore`、 + `locomotion/go2/tensor_parity.py`,ADR-0011/0012 证据引用已同步);PPO + owner 的死键 `algo.resume` / `algo.resume_path`(PPO 入口经 + `reject_removed_ppo_resume_keys` fail-closed;PPO resume 仍走 + `algo.load_run` + `algo.checkpoint`;off-policy owner 继续拥有活键); + `TorchEnv.record_finite_validation` 被静默丢弃的 `label` 参数;仅 tests + 消费的调试面(`ManagerBase.get_active_iterable_terms` 及其各 manager 实现、 + `extract_reset_obs`、`render_play_mode` 与 + `run_native_viewer_play_loop` 薄封装——调用方改为直接使用 + `env.run_playback`——以及 `OnPolicyLogger` 及其 api_reference 条目); + 零消费的 noise cfg(`ConstantNoiseCfg`、`GaussianNoiseCfg`、 + `SegmentwiseUniformNoiseCfg`;保留 `UniformNoiseCfg` 与 `NoiseModel` + 扩展基座)。 ## 1.5.11 (2026-11-16) diff --git a/docs/sphinx/source/en/2-user_guide/4-tasks/2-motion_tracking.md b/docs/sphinx/source/en/2-user_guide/4-tasks/2-motion_tracking.md index ce33f7031..04c627707 100644 --- a/docs/sphinx/source/en/2-user_guide/4-tasks/2-motion_tracking.md +++ b/docs/sphinx/source/en/2-user_guide/4-tasks/2-motion_tracking.md @@ -109,7 +109,8 @@ CUDA_VISIBLE_DEVICES=1 uv run train --algo sac --task g1_motion_tracking --sim m training.use_amp=true algo.seed=1 \ env.commands.motion.params.motion_file=motions/g1/motion_crawl_slope_uni.npz \ env.scene.model_file=src/unilab/assets/robots/g1/scene_crawl_slope.xml \ - env.commands.motion.params.sampling_mode=start \ + env.commands.motion.params.sampling_mode=mixed \ + env.commands.motion.params.sampling_start_ratio=1.0 \ env.commands.motion.params.truncate_on_clip_end=true \ env.max_episode_seconds=20.0 \ 'env.commands.motion.params.pose_range={x:[0,0],y:[0,0],z:[0,0],roll:[0,0],pitch:[0,0],yaw:[0,0]}' \ @@ -120,9 +121,10 @@ CUDA_VISIBLE_DEVICES=1 uv run train --algo sac --task g1_motion_tracking --sim m Key overrides: `env.commands.motion.params.motion_file` selects the crawl-slope clip; `env.scene.model_file` switches to the slope scene (`scene_crawl_slope.xml` exists under `src/unilab/assets/robots/g1/`); -`sampling_mode=start` plus `truncate_on_clip_end=true` starts from the clip -beginning and truncates there; and zeroing the command reset ranges reuses the -exact clip initial state. +`sampling_mode=mixed` with `sampling_start_ratio=1.0` plus +`truncate_on_clip_end=true` starts every episode from the clip beginning and +truncates there; and zeroing the command reset ranges reuses the exact clip +initial state. ## Interactive Debugging diff --git a/docs/sphinx/source/zh_CN/2-user_guide/4-tasks/2-motion_tracking.md b/docs/sphinx/source/zh_CN/2-user_guide/4-tasks/2-motion_tracking.md index 93e160466..54b5621d0 100644 --- a/docs/sphinx/source/zh_CN/2-user_guide/4-tasks/2-motion_tracking.md +++ b/docs/sphinx/source/zh_CN/2-user_guide/4-tasks/2-motion_tracking.md @@ -103,7 +103,8 @@ CUDA_VISIBLE_DEVICES=1 uv run train --algo sac --task g1_motion_tracking --sim m training.use_amp=true algo.seed=1 \ env.commands.motion.params.motion_file=motions/g1/motion_crawl_slope_uni.npz \ env.scene.model_file=src/unilab/assets/robots/g1/scene_crawl_slope.xml \ - env.commands.motion.params.sampling_mode=start \ + env.commands.motion.params.sampling_mode=mixed \ + env.commands.motion.params.sampling_start_ratio=1.0 \ env.commands.motion.params.truncate_on_clip_end=true \ env.max_episode_seconds=20.0 \ 'env.commands.motion.params.pose_range={x:[0,0],y:[0,0],z:[0,0],roll:[0,0],pitch:[0,0],yaw:[0,0]}' \ @@ -113,8 +114,9 @@ CUDA_VISIBLE_DEVICES=1 uv run train --algo sac --task g1_motion_tracking --sim m 关键覆写:`env.commands.motion.params.motion_file` 切换爬坡动作; `env.scene.model_file` 切换斜坡场景(`scene_crawl_slope.xml` 在 -`src/unilab/assets/robots/g1/` 下);`sampling_mode=start` 加 -`truncate_on_clip_end=true` 从 clip 起点出发并在结尾截断;command reset 范围全置零 +`src/unilab/assets/robots/g1/` 下);`sampling_mode=mixed` 且 +`sampling_start_ratio=1.0`,再加 `truncate_on_clip_end=true`,每个 episode 都从 clip +起点出发并在结尾截断;command reset 范围全置零 即可复用 motion 的精确初始状态。 ## 交互式调试 diff --git a/scripts/benchmark/benchmark_drake_performance.py b/scripts/benchmark/benchmark_drake_performance.py index 11806ef16..17e8cf9cc 100644 --- a/scripts/benchmark/benchmark_drake_performance.py +++ b/scripts/benchmark/benchmark_drake_performance.py @@ -141,7 +141,6 @@ def _compose_env_cfg(task: str, backend: str, spec: TaskSpec) -> Any: env_cfg_override = EnvConfigAdapter( owner_cfg, root_dir=ROOT_DIR, - algo_name="ppo", ).build_task_env_cfg_override() cfg = spec.env_cfg_factory() apply_cfg_overrides(cfg, env_cfg_override) diff --git a/scripts/benchmark/env/benchmark_env_step.py b/scripts/benchmark/env/benchmark_env_step.py index f5b3f2614..9a08ac6a9 100644 --- a/scripts/benchmark/env/benchmark_env_step.py +++ b/scripts/benchmark/env/benchmark_env_step.py @@ -150,7 +150,6 @@ def _owner_yaml_cfg( env_cfg_override = EnvConfigAdapter( owner_cfg, root_dir=ROOT_DIR, - algo_name=algo_name, ).build_task_env_cfg_override() cfg = env_cfg_cls() diff --git a/scripts/benchmark/env/benchmark_env_step_phase_cpu.py b/scripts/benchmark/env/benchmark_env_step_phase_cpu.py index 59b742263..c04751649 100644 --- a/scripts/benchmark/env/benchmark_env_step_phase_cpu.py +++ b/scripts/benchmark/env/benchmark_env_step_phase_cpu.py @@ -102,9 +102,7 @@ def main(argv: Sequence[str] | None = None) -> int: overrides=[f"task={args.task}", f"algo.num_envs={args.num_envs}"], ) OmegaConf.resolve(cfg) - env_cfg_override = EnvConfigAdapter( - cfg, root_dir=REPO_ROOT, algo_name=str(cfg.algo.algo) - ).build_task_env_cfg_override() + env_cfg_override = EnvConfigAdapter(cfg, root_dir=REPO_ROOT).build_task_env_cfg_override() if args.cpu_ids is not None: env_cfg_override = { **(env_cfg_override or {}), diff --git a/scripts/benchmark/rl/benchmark_offpolicy_collector_active.py b/scripts/benchmark/rl/benchmark_offpolicy_collector_active.py index 6eb7df2a9..3e8c9501e 100644 --- a/scripts/benchmark/rl/benchmark_offpolicy_collector_active.py +++ b/scripts/benchmark/rl/benchmark_offpolicy_collector_active.py @@ -1133,7 +1133,6 @@ def _build_and_run_case( env_cfg_override = EnvConfigAdapter( cfg, root_dir=ROOT_DIR, - algo_name=algo, ).build_task_env_cfg_override() env = None diff --git a/scripts/benchmark/rl/benchmark_replay_buffer_placement.py b/scripts/benchmark/rl/benchmark_replay_buffer_placement.py index 489032dad..3cba89dd4 100644 --- a/scripts/benchmark/rl/benchmark_replay_buffer_placement.py +++ b/scripts/benchmark/rl/benchmark_replay_buffer_placement.py @@ -319,7 +319,6 @@ def _resolve_env_shape(cfg: DictConfig, algo: str) -> ReplayShape: env_cfg_override = EnvConfigAdapter( cfg, root_dir=ROOT_DIR, - algo_name=algo, ).build_task_env_cfg_override() env = create_env(cfg, num_envs=1, env_cfg_override=env_cfg_override) try: diff --git a/scripts/benchmark/rl/benchmark_sac_replay_buffer_sampling.py b/scripts/benchmark/rl/benchmark_sac_replay_buffer_sampling.py index 7bbb662d4..f7ad2f940 100644 --- a/scripts/benchmark/rl/benchmark_sac_replay_buffer_sampling.py +++ b/scripts/benchmark/rl/benchmark_sac_replay_buffer_sampling.py @@ -262,7 +262,6 @@ def _resolve_env_shape(cfg: DictConfig) -> ReplayShape: env_cfg_override = EnvConfigAdapter( cfg, root_dir=ROOT_DIR, - algo_name="sac", ).build_task_env_cfg_override() env = create_env(cfg, num_envs=1, env_cfg_override=env_cfg_override) try: diff --git a/scripts/benchmark/torch_env/g1_flashsac_backend.py b/scripts/benchmark/torch_env/g1_flashsac_backend.py index 582d8db8c..b32e7b952 100644 --- a/scripts/benchmark/torch_env/g1_flashsac_backend.py +++ b/scripts/benchmark/torch_env/g1_flashsac_backend.py @@ -183,9 +183,7 @@ def _build_cfg(backend: str, num_envs: int, *, isaacsim_test_fixture: bool = Fal "hydra/hydra_logging=disabled", ], ) - override = EnvConfigAdapter( - owner_cfg, root_dir=ROOT_DIR, algo_name="flashsac" - ).build_task_env_cfg_override() + override = EnvConfigAdapter(owner_cfg, root_dir=ROOT_DIR).build_task_env_cfg_override() cfg = ManagerBasedRlEnvCfg() apply_cfg_overrides(cfg, override) return cfg diff --git a/scripts/visualize_task_env.py b/scripts/visualize_task_env.py index 40c908a64..e4e68ddfa 100644 --- a/scripts/visualize_task_env.py +++ b/scripts/visualize_task_env.py @@ -10,7 +10,7 @@ Mujoco backend: stitches all `--num_envs` robot replicas into the same scene and drives every replica's qpos/qvel each frame from `env.get_physics_state_snapshot()`. -Motrix backend: delegates to `render_play_mode`, whose native renderer lays +Motrix backend: delegates to `env.run_playback`, whose native renderer lays all `num_envs` robots out on a grid using `cfg.render_spacing`. Usage: @@ -103,8 +103,6 @@ def _stitch_replicas(parent_scene_xml: Path, robot_base_xml: Path, env_origins: def _run_motrix(env, num_envs: int) -> None: - from unilab.visualization import render_play_mode - actions = np.zeros((num_envs, env.action_space.shape[0]), dtype=np.float32) camera_kwargs = _motrix_camera_kwargs(env, num_envs) @@ -114,8 +112,7 @@ def initialize(): def step(_obs): return env.step(actions) - render_play_mode( - env, + env.run_playback( initialize=initialize, step=step, num_steps=None, diff --git a/src/unilab/assets/hub.py b/src/unilab/assets/hub.py index 8ae77badc..487e7e79a 100644 --- a/src/unilab/assets/hub.py +++ b/src/unilab/assets/hub.py @@ -135,23 +135,16 @@ def resolve_motion_files( return [_resolve_single(p, repo_id=_HF_MOTIONS_REPO_ID) for p in motion_file] -def resolve_checkpoint_file( - checkpoint_file: str | Sequence[str], -) -> str | list[str]: - """Ensure checkpoint file(s) exist locally, downloading from HF if needed. +def resolve_checkpoint_file(checkpoint_file: str) -> str: + """Ensure a checkpoint file exists locally, downloading from HF if needed. Args: - checkpoint_file: Absolute path or ``ASSETS_ROOT_PATH``-relative path - (single string or sequence of strings). + checkpoint_file: Absolute path or ``ASSETS_ROOT_PATH``-relative path. Returns: - Resolved absolute path(s) guaranteed to exist on disk. - A single string input returns a single string; a sequence input - returns a list of strings. + Resolved absolute path guaranteed to exist on disk. """ - if isinstance(checkpoint_file, str): - return _resolve_single(checkpoint_file, repo_id=_HF_CHECKPOINTS_REPO_ID) - return [_resolve_single(p, repo_id=_HF_CHECKPOINTS_REPO_ID) for p in checkpoint_file] + return _resolve_single(checkpoint_file, repo_id=_HF_CHECKPOINTS_REPO_ID) def _resolve_single( diff --git a/src/unilab/base/config_adapter.py b/src/unilab/base/config_adapter.py index 97b1b2e62..13d97c5ea 100644 --- a/src/unilab/base/config_adapter.py +++ b/src/unilab/base/config_adapter.py @@ -22,12 +22,10 @@ def __init__( cfg: DictConfig, *, root_dir: str | Path, - algo_name: str | None = None, scene_materializer: Callable[..., str] = materialize_scene_visual_override, ) -> None: self.cfg = cfg self.root_dir = Path(root_dir) - self.algo_name = algo_name self.scene_materializer = scene_materializer def build_task_env_cfg_override(self) -> dict[str, Any]: diff --git a/src/unilab/base/contracts/env.py b/src/unilab/base/contracts/env.py index 564df966d..a75b0de1d 100644 --- a/src/unilab/base/contracts/env.py +++ b/src/unilab/base/contracts/env.py @@ -83,21 +83,6 @@ class EnvAlgoCapabilitiesProtocol(Protocol): ``step``/``reset`` hot loops. """ - @property - def action_low(self) -> torch.Tensor | None: - """Per-dimension lower action bounds, shape ``(action_dim,)``.""" - ... - - @property - def action_high(self) -> torch.Tensor | None: - """Per-dimension upper action bounds, shape ``(action_dim,)``.""" - ... - - @property - def joint_names(self) -> tuple[str, ...] | None: - """Joint names in action order, for symmetry-augmentation maps.""" - ... - @property def reward_component_names(self) -> tuple[str, ...] | None: """Reward component names for fixed-width device metric aggregation.""" @@ -108,9 +93,6 @@ def reward_component_names(self) -> tuple[str, ...] | None: class EnvAlgoCapabilities: """Default capability carrier with every field unset.""" - action_low: torch.Tensor | None = None - action_high: torch.Tensor | None = None - joint_names: tuple[str, ...] | None = None reward_component_names: tuple[str, ...] | None = None diff --git a/src/unilab/base/entity.py b/src/unilab/base/entity.py index 95eeab7b3..5dbd21521 100644 --- a/src/unilab/base/entity.py +++ b/src/unilab/base/entity.py @@ -1943,7 +1943,7 @@ def __init__( # When the owning env defers finite validation, per-step write checks # accumulate into the env's device-resident verdict instead of # synchronizing on every call; the env's poll boundary raises. - self._finite_validation_recorder: Callable[[torch.Tensor, str], None] | None = None + self._finite_validation_recorder: Callable[[torch.Tensor], None] | None = None self._interval_operand_device_value: torch.device | None = None self._interval_root_body_ids_value: torch.Tensor | None = None self._body_tensor_layouts: dict[tuple[str, ...], np.ndarray] = {} @@ -2171,7 +2171,7 @@ def motion_body_ids(self) -> np.ndarray: return self._motion_body_ids def set_finite_validation_recorder( - self, recorder: Callable[[torch.Tensor, str], None] | None + self, recorder: Callable[[torch.Tensor], None] | None ) -> None: """Route per-step tensor-write finite verdicts into the env boundary. @@ -4269,7 +4269,7 @@ def _validate_body_wrench_values( ) recorder = self._finite_validation_recorder if recorder is not None: - recorder(values, f"{term_name} body {label}") + recorder(values) elif not bool(torch.isfinite(values).all()): raise ValueError( f"EventManager term '{term_name}' body {label} must be finite floating data" diff --git a/src/unilab/base/registry.py b/src/unilab/base/registry.py index 97af81823..bd565c447 100644 --- a/src/unilab/base/registry.py +++ b/src/unilab/base/registry.py @@ -211,18 +211,6 @@ def decorator(factory: TEnvFactory) -> TEnvFactory: return decorator -def find_available_sim_backend(env_name: str) -> str: - """Find the explicit default simulation backend for an environment.""" - if env_name not in _envs: - raise ValueError(f"Environment '{env_name}' is not registered.") - - meta: EnvMeta = _envs[env_name] - backend = meta.available_sim_backend() - if backend is None: - raise ValueError(f"Environment '{env_name}' does not support any simulation backend.") - return backend - - def resolve_reward_override_field(env_name: str) -> RewardOverrideField: """Resolve the Manager-Based Hydra root reward target for an env config.""" if env_name not in _envs: diff --git a/src/unilab/base/torch_env.py b/src/unilab/base/torch_env.py index 0c74ff3e4..ad21667fe 100644 --- a/src/unilab/base/torch_env.py +++ b/src/unilab/base/torch_env.py @@ -862,7 +862,7 @@ def _validate_final_observation( ) if self._defer_finite_validation: self._require_floating_float(value) - self._record_finite_validation(value, f"final_observation[{name!r}]") + self._record_finite_validation(value) else: self._validate_finite_float(value, f"final_observation[{name!r}]") @@ -1313,15 +1313,14 @@ def finite_validation_interval(self) -> int: """Number of steps between deferred finite-validation polls.""" return self._finite_validation_interval - def _record_finite_validation(self, value: torch.Tensor, label: str = "") -> None: + def _record_finite_validation(self, value: torch.Tensor) -> None: """Accumulate one finite verdict without a scalar host read.""" - del label if self._defer_finite_validation: self._finite_verdict.logical_and_(torch.isfinite(value).all()) - def record_finite_validation(self, value: torch.Tensor, label: str = "") -> None: + def record_finite_validation(self, value: torch.Tensor) -> None: """Allow a manager to add a finite verdict to the shared boundary.""" - self._record_finite_validation(value, label) + self._record_finite_validation(value) def poll_finite_validation(self, *, force: bool = False) -> bool: """Publish all deferred verdicts at one fixed host boundary.""" diff --git a/src/unilab/conf/appo/task/g1_motion_tracking/base.yaml b/src/unilab/conf/appo/task/g1_motion_tracking/base.yaml index 293b198df..8b191e861 100644 --- a/src/unilab/conf/appo/task/g1_motion_tracking/base.yaml +++ b/src/unilab/conf/appo/task/g1_motion_tracking/base.yaml @@ -144,7 +144,6 @@ env: anchor_body_name: torso_link body_names: *tracked_bodies sampling_mode: adaptive - sampling_start_ratio: 0.0 truncate_on_clip_end: false pose_range: x: [-0.05, 0.05] @@ -160,8 +159,6 @@ env: roll: [-0.52, 0.52] pitch: [-0.52, 0.52] yaw: [-0.78, 0.78] - joint_position_range: [-0.1, 0.1] - joint_default_position_range: [0.0, 0.0] terminations: time_out: func: unilab.envs.mdp.time_out diff --git a/src/unilab/conf/appo/task/g1_walk_flat/base.yaml b/src/unilab/conf/appo/task/g1_walk_flat/base.yaml index 6d0abc8a1..ec606af4f 100644 --- a/src/unilab/conf/appo/task/g1_walk_flat/base.yaml +++ b/src/unilab/conf/appo/task/g1_walk_flat/base.yaml @@ -167,7 +167,6 @@ env: rel_heading_envs: 0.0 rel_world_envs: 0.0 rel_forward_envs: 0.0 - init_velocity_prob: 0.0 planar_dead_zone: 0.2 ranges: lin_vel_x: [-0.6, 1.0] diff --git a/src/unilab/conf/appo/task/go2_joystick_flat/base.yaml b/src/unilab/conf/appo/task/go2_joystick_flat/base.yaml index c465a8491..94c95a752 100644 --- a/src/unilab/conf/appo/task/go2_joystick_flat/base.yaml +++ b/src/unilab/conf/appo/task/go2_joystick_flat/base.yaml @@ -109,7 +109,6 @@ env: rel_heading_envs: 0.0 rel_world_envs: 0.0 rel_forward_envs: 0.0 - init_velocity_prob: 0.0 ranges: lin_vel_x: [-0.6, 1.0] lin_vel_y: [-0.4, 0.4] diff --git a/src/unilab/conf/flashsac/task/g1_motion_tracking/base.yaml b/src/unilab/conf/flashsac/task/g1_motion_tracking/base.yaml index 7fc2b4da5..29529fb83 100644 --- a/src/unilab/conf/flashsac/task/g1_motion_tracking/base.yaml +++ b/src/unilab/conf/flashsac/task/g1_motion_tracking/base.yaml @@ -175,7 +175,6 @@ env: anchor_body_name: torso_link body_names: *tracked_bodies sampling_mode: adaptive - sampling_start_ratio: 0.0 truncate_on_clip_end: true pose_range: x: [-0.05, 0.05] @@ -191,8 +190,6 @@ env: roll: [-0.52, 0.52] pitch: [-0.52, 0.52] yaw: [-0.78, 0.78] - joint_position_range: [-0.1, 0.1] - joint_default_position_range: [0.0, 0.0] terminations: time_out: func: unilab.envs.mdp.time_out diff --git a/src/unilab/conf/flashsac/task/g1_walk_flat/base.yaml b/src/unilab/conf/flashsac/task/g1_walk_flat/base.yaml index cc0cd9d47..5e8220620 100644 --- a/src/unilab/conf/flashsac/task/g1_walk_flat/base.yaml +++ b/src/unilab/conf/flashsac/task/g1_walk_flat/base.yaml @@ -163,7 +163,6 @@ env: rel_heading_envs: 0.0 rel_world_envs: 0.0 rel_forward_envs: 0.0 - init_velocity_prob: 0.0 planar_dead_zone: 0.2 ranges: lin_vel_x: [-0.6, 1.0] diff --git a/src/unilab/conf/flashsac/task/go2_joystick_flat/base.yaml b/src/unilab/conf/flashsac/task/go2_joystick_flat/base.yaml index 0472991dd..0760b146a 100644 --- a/src/unilab/conf/flashsac/task/go2_joystick_flat/base.yaml +++ b/src/unilab/conf/flashsac/task/go2_joystick_flat/base.yaml @@ -109,7 +109,6 @@ env: rel_heading_envs: 0.0 rel_world_envs: 0.0 rel_forward_envs: 0.0 - init_velocity_prob: 0.0 ranges: lin_vel_x: [-0.6, 1.0] lin_vel_y: [-0.4, 0.4] diff --git a/src/unilab/conf/ppo/config.yaml b/src/unilab/conf/ppo/config.yaml index 9507e0bb8..90d57b441 100644 --- a/src/unilab/conf/ppo/config.yaml +++ b/src/unilab/conf/ppo/config.yaml @@ -13,12 +13,9 @@ algo: obs_groups: actor: - policy - experiment_name: test - run_name: "" resume: false load_run: "-1" checkpoint: -1 - resume_path: null actor: class_name: rsl_rl.models.MLPModel hidden_dims: [512, 256, 128] diff --git a/src/unilab/conf/ppo/task/g1_motion_tracking/base.yaml b/src/unilab/conf/ppo/task/g1_motion_tracking/base.yaml index 9bfdbd300..1078eedf0 100644 --- a/src/unilab/conf/ppo/task/g1_motion_tracking/base.yaml +++ b/src/unilab/conf/ppo/task/g1_motion_tracking/base.yaml @@ -145,7 +145,6 @@ env: anchor_body_name: torso_link body_names: *tracked_bodies sampling_mode: adaptive - sampling_start_ratio: 0.0 truncate_on_clip_end: false pose_range: x: [-0.05, 0.05] @@ -161,8 +160,6 @@ env: roll: [-0.52, 0.52] pitch: [-0.52, 0.52] yaw: [-0.78, 0.78] - joint_position_range: [-0.1, 0.1] - joint_default_position_range: [0.0, 0.0] terminations: time_out: func: unilab.envs.mdp.time_out diff --git a/src/unilab/conf/ppo/task/g1_walk_flat/base.yaml b/src/unilab/conf/ppo/task/g1_walk_flat/base.yaml index f823037bb..e8803f9e8 100644 --- a/src/unilab/conf/ppo/task/g1_walk_flat/base.yaml +++ b/src/unilab/conf/ppo/task/g1_walk_flat/base.yaml @@ -167,7 +167,6 @@ env: rel_heading_envs: 0.0 rel_world_envs: 0.0 rel_forward_envs: 0.0 - init_velocity_prob: 0.0 planar_dead_zone: 0.2 ranges: lin_vel_x: [-0.6, 1.0] diff --git a/src/unilab/conf/ppo/task/go2_joystick_flat/base.yaml b/src/unilab/conf/ppo/task/go2_joystick_flat/base.yaml index 0472991dd..0760b146a 100644 --- a/src/unilab/conf/ppo/task/go2_joystick_flat/base.yaml +++ b/src/unilab/conf/ppo/task/go2_joystick_flat/base.yaml @@ -109,7 +109,6 @@ env: rel_heading_envs: 0.0 rel_world_envs: 0.0 rel_forward_envs: 0.0 - init_velocity_prob: 0.0 ranges: lin_vel_x: [-0.6, 1.0] lin_vel_y: [-0.4, 0.4] diff --git a/src/unilab/conf/sac/config.yaml b/src/unilab/conf/sac/config.yaml index ee8b55b62..31e95b9c4 100644 --- a/src/unilab/conf/sac/config.yaml +++ b/src/unilab/conf/sac/config.yaml @@ -31,7 +31,6 @@ algo: num_atoms: 101 obs_normalization: false use_layer_norm: true - actor: {} algo_params: alpha_lr: 3.0e-4 alpha_init: 0.01 diff --git a/src/unilab/conf/sac/task/g1_motion_tracking/base.yaml b/src/unilab/conf/sac/task/g1_motion_tracking/base.yaml index 8739bc83b..3c7d0b7cd 100644 --- a/src/unilab/conf/sac/task/g1_motion_tracking/base.yaml +++ b/src/unilab/conf/sac/task/g1_motion_tracking/base.yaml @@ -176,7 +176,6 @@ env: anchor_body_name: torso_link body_names: *tracked_bodies sampling_mode: adaptive - sampling_start_ratio: 0.0 truncate_on_clip_end: true pose_range: x: [-0.05, 0.05] @@ -192,8 +191,6 @@ env: roll: [-0.52, 0.52] pitch: [-0.52, 0.52] yaw: [-0.78, 0.78] - joint_position_range: [-0.1, 0.1] - joint_default_position_range: [0.0, 0.0] terminations: time_out: func: unilab.envs.mdp.time_out diff --git a/src/unilab/conf/sac/task/g1_walk_flat/base.yaml b/src/unilab/conf/sac/task/g1_walk_flat/base.yaml index cc0cd9d47..5e8220620 100644 --- a/src/unilab/conf/sac/task/g1_walk_flat/base.yaml +++ b/src/unilab/conf/sac/task/g1_walk_flat/base.yaml @@ -163,7 +163,6 @@ env: rel_heading_envs: 0.0 rel_world_envs: 0.0 rel_forward_envs: 0.0 - init_velocity_prob: 0.0 planar_dead_zone: 0.2 ranges: lin_vel_x: [-0.6, 1.0] diff --git a/src/unilab/conf/sac/task/go2_joystick_flat/base.yaml b/src/unilab/conf/sac/task/go2_joystick_flat/base.yaml index 0472991dd..0760b146a 100644 --- a/src/unilab/conf/sac/task/go2_joystick_flat/base.yaml +++ b/src/unilab/conf/sac/task/go2_joystick_flat/base.yaml @@ -109,7 +109,6 @@ env: rel_heading_envs: 0.0 rel_world_envs: 0.0 rel_forward_envs: 0.0 - init_velocity_prob: 0.0 ranges: lin_vel_x: [-0.6, 1.0] lin_vel_y: [-0.4, 0.4] diff --git a/src/unilab/envs/manager_based_rl_env.py b/src/unilab/envs/manager_based_rl_env.py index a3cba5b88..02340c13e 100644 --- a/src/unilab/envs/manager_based_rl_env.py +++ b/src/unilab/envs/manager_based_rl_env.py @@ -1710,16 +1710,8 @@ def publish_reward_log(self) -> dict[str, float]: @property def algo_capabilities(self) -> Any: - """Expose cold-path metadata to algorithm owners. - - Per-dimension action bounds and action-order joint names are reserved - fields. They intentionally stay unset until an algorithm consumes them; - the Manager-Based action owner, not the RL runtime, owns their source. - """ + """Expose cold-path metadata to algorithm owners.""" return EnvAlgoCapabilities( - action_low=None, - action_high=None, - joint_names=None, reward_component_names=self.reward_manager.step_reward_names, ) diff --git a/src/unilab/envs/mdp/actions/actions.py b/src/unilab/envs/mdp/actions/actions.py index 02ffeb481..24f790a3c 100644 --- a/src/unilab/envs/mdp/actions/actions.py +++ b/src/unilab/envs/mdp/actions/actions.py @@ -73,7 +73,6 @@ class BaseActionCfg(ActionTermCfg): actuator_names: tuple[str, ...] | list[str] scale: float | dict[str, float] = 1.0 offset: float | dict[str, float] = 0.0 - preserve_order: bool = False class BaseAction(ActionTerm): diff --git a/src/unilab/envs/mdp/commands/velocity_command.py b/src/unilab/envs/mdp/commands/velocity_command.py index df0f8cc93..85e6b156c 100644 --- a/src/unilab/envs/mdp/commands/velocity_command.py +++ b/src/unilab/envs/mdp/commands/velocity_command.py @@ -56,11 +56,6 @@ class UniformVelocityCommand(CommandTerm): def __init__(self, cfg: UniformVelocityCommandCfg, env: ManagerBasedRlEnv): self._validate_cfg(cfg) super().__init__(cfg, env) - if cfg.init_velocity_prob > 0.0: - raise NotImplementedError( - "UniformVelocityCommand capability 'initial root velocity write' is " - "unavailable in the UniLab entity facade; set init_velocity_prob=0" - ) self.robot = cast("Entity", env.scene[cfg.entity_name]) self._tensor_command = torch.zeros( @@ -92,7 +87,6 @@ def _validate_cfg(cfg: UniformVelocityCommandCfg) -> None: "rel_heading_envs", "rel_world_envs", "rel_forward_envs", - "init_velocity_prob", ): _ratio(getattr(cfg, name), label=f"UniformVelocityCommandCfg {name}") if not isinstance(cfg.ranges, UniformVelocityCommandCfg.Ranges): @@ -352,7 +346,6 @@ class UniformVelocityCommandCfg(CommandTermCfg): rel_heading_envs: float = 1.0 rel_world_envs: float = 0.0 rel_forward_envs: float = 0.0 - init_velocity_prob: float = 0.0 @dataclass class Ranges: @@ -363,13 +356,6 @@ class Ranges: ranges: Ranges - @dataclass - class VizCfg: - z_offset: float = 0.2 - scale: float = 0.5 - - viz: VizCfg = field(default_factory=VizCfg) - def build(self, env: ManagerBasedRlEnv) -> UniformVelocityCommand: return UniformVelocityCommand(self, env) diff --git a/src/unilab/envs/mdp/observations.py b/src/unilab/envs/mdp/observations.py index a99b6914f..aac23948d 100644 --- a/src/unilab/envs/mdp/observations.py +++ b/src/unilab/envs/mdp/observations.py @@ -157,7 +157,7 @@ def _read_tensor(self, env: ManagerBasedRlEnv) -> torch.Tensor: if getattr(env, "defer_finite_validation", False): record = getattr(env, "record_finite_validation", None) if callable(record): - record(value, f"observation/{self._term_name}") + record(value) elif not bool(torch.isfinite(value).all()): raise ValueError(f"Observation term '{self._term_name}' received NaN or Inf") elif not bool(torch.isfinite(value).all()): diff --git a/src/unilab/envs/mdp/terminations.py b/src/unilab/envs/mdp/terminations.py index 041b80f8f..c02cef94e 100644 --- a/src/unilab/envs/mdp/terminations.py +++ b/src/unilab/envs/mdp/terminations.py @@ -40,7 +40,7 @@ def _state_tensor( # Deferred mode accumulates the verdict on the env's device-resident # carrier; the fixed poll boundary raises on a latched failure instead # of synchronizing here on every step. - env.record_finite_validation(state, f"termination[{term_name!r}]") + env.record_finite_validation(state) return state if not bool(torch.isfinite(state).all()): invalid_rows = torch.nonzero(~torch.isfinite(state).all(dim=1)).flatten()[:10] diff --git a/src/unilab/managers/__init__.py b/src/unilab/managers/__init__.py index 02a7a4b60..8a3654ee6 100644 --- a/src/unilab/managers/__init__.py +++ b/src/unilab/managers/__init__.py @@ -5,16 +5,11 @@ from unilab.managers._buffers import CircularBuffer as CircularBuffer from unilab.managers._buffers import DelayBuffer as DelayBuffer -from unilab.managers._noise.noise_cfg import ConstantNoiseCfg as ConstantNoiseCfg -from unilab.managers._noise.noise_cfg import GaussianNoiseCfg as GaussianNoiseCfg from unilab.managers._noise.noise_cfg import NoiseCfg as NoiseCfg from unilab.managers._noise.noise_cfg import NoiseModelCfg as NoiseModelCfg from unilab.managers._noise.noise_cfg import ( NoiseModelWithAdditiveBiasCfg as NoiseModelWithAdditiveBiasCfg, ) -from unilab.managers._noise.noise_cfg import ( - SegmentwiseUniformNoiseCfg as SegmentwiseUniformNoiseCfg, -) from unilab.managers._noise.noise_cfg import UniformNoiseCfg as UniformNoiseCfg from unilab.managers.action_manager import ActionManager as ActionManager from unilab.managers.action_manager import ActionTerm as ActionTerm diff --git a/src/unilab/managers/_buffers/delay_buffer.py b/src/unilab/managers/_buffers/delay_buffer.py index a338e282c..aa8102eb6 100644 --- a/src/unilab/managers/_buffers/delay_buffer.py +++ b/src/unilab/managers/_buffers/delay_buffer.py @@ -174,21 +174,6 @@ def current_lags(self) -> torch.Tensor: """Current lag per environment. Shape: (batch_size,).""" return self._current_lags - def set_lags( - self, - lags: torch.Tensor, - batch_ids: Sequence[int] | torch.Tensor | slice | None = None, - ) -> None: - """Set lag values for specified environments. - - Args: - lags: Lag values to set. Shape: (num_batch_ids,) or scalar. - batch_ids: Batch indices to set, or None to set all. - """ - idx = slice(None) if batch_ids is None else batch_ids - values = torch.as_tensor(lags, dtype=torch.int64, device=self._device) - self._current_lags[idx] = values.clamp(self.min_lag, self.max_lag) - def reset( self, batch_ids: Sequence[int] | torch.Tensor | slice | ResetSelection | None = None, diff --git a/src/unilab/managers/_noise/__init__.py b/src/unilab/managers/_noise/__init__.py index 98297d15c..9f496df91 100644 --- a/src/unilab/managers/_noise/__init__.py +++ b/src/unilab/managers/_noise/__init__.py @@ -1,16 +1,11 @@ # Derived from mujocolab/mjlab v1.6.0 (0fb8a681), src/mjlab/utils/noise/__init__.py. # Copyright 2025, The mjlab Developers. # Modified by UniLab for NumPy and UniLab contracts; licensed under Apache-2.0. -from unilab.managers._noise.noise_cfg import ConstantNoiseCfg as ConstantNoiseCfg -from unilab.managers._noise.noise_cfg import GaussianNoiseCfg as GaussianNoiseCfg from unilab.managers._noise.noise_cfg import NoiseCfg as NoiseCfg from unilab.managers._noise.noise_cfg import NoiseModelCfg as NoiseModelCfg from unilab.managers._noise.noise_cfg import ( NoiseModelWithAdditiveBiasCfg as NoiseModelWithAdditiveBiasCfg, ) -from unilab.managers._noise.noise_cfg import ( - SegmentwiseUniformNoiseCfg as SegmentwiseUniformNoiseCfg, -) from unilab.managers._noise.noise_cfg import UniformNoiseCfg as UniformNoiseCfg from unilab.managers._noise.noise_model import NoiseModel as NoiseModel from unilab.managers._noise.noise_model import ( diff --git a/src/unilab/managers/_noise/noise_cfg.py b/src/unilab/managers/_noise/noise_cfg.py index 74f8c03d9..9f5a8207e 100644 --- a/src/unilab/managers/_noise/noise_cfg.py +++ b/src/unilab/managers/_noise/noise_cfg.py @@ -4,7 +4,6 @@ from __future__ import annotations import abc -import math from dataclasses import dataclass from typing import ClassVar, Literal @@ -16,8 +15,6 @@ # Type alias for noise parameters: scalar or per-dimension values. NoiseParam = float | tuple[float, ...] -SegmentRange = tuple[float, float] - @dataclass(kw_only=True) class NoiseCfg(abc.ABC): @@ -74,30 +71,6 @@ def _cached_torch( return cached -@dataclass -class ConstantNoiseCfg(NoiseCfg): - bias: NoiseParam = 0.0 - - @override - def apply( - self, - data: torch.Tensor, - *, - torch_rng: torch.Generator | None = None, - ) -> torch.Tensor: - del torch_rng - if not isinstance(data, torch.Tensor): - raise TypeError(f"Noise data must be torch.Tensor, got {type(data).__name__}") - bias = self._as_torch(self.bias, dtype=data.dtype, device=data.device) - if self.operation == "add": - return data + bias - if self.operation == "scale": - return data * bias - if self.operation == "abs": - return torch.zeros_like(data) + bias - raise ValueError(f"Unsupported noise operation: {self.operation}") - - @dataclass class UniformNoiseCfg(NoiseCfg): n_min: NoiseParam = -1.0 @@ -132,107 +105,6 @@ def apply( return self._apply_noise(data, unit * (n_max - n_min) + n_min) -@dataclass(kw_only=True) -class SegmentwiseUniformNoiseCfg(NoiseCfg): - """Independent additive uniform noise with a bound for each final column.""" - - ranges: tuple[SegmentRange, ...] - _lower_torch: torch.Tensor | None = None - _upper_torch: torch.Tensor | None = None - - def __post_init__(self): - self.ranges = tuple((float(lower), float(upper)) for lower, upper in self.ranges) - if not self.ranges: - raise ValueError("SegmentwiseUniformNoiseCfg requires at least one range") - if any(lower > upper for lower, upper in self.ranges): - raise ValueError( - f"Each SegmentwiseUniformNoiseCfg range must satisfy min <= max; got {self.ranges}" - ) - - def _bounds( - self, *, dtype: torch.dtype, device: torch.device - ) -> tuple[torch.Tensor, torch.Tensor]: - if ( - self._lower_torch is not None - and self._upper_torch is not None - and self._lower_torch.device == device - and self._lower_torch.dtype == dtype - and self._upper_torch.device == device - and self._upper_torch.dtype == dtype - ): - return self._lower_torch, self._upper_torch - self._lower_torch = torch.as_tensor( - [range[0] for range in self.ranges], dtype=dtype, device=device - ) - self._upper_torch = torch.as_tensor( - [range[1] for range in self.ranges], dtype=dtype, device=device - ) - return self._lower_torch, self._upper_torch - - @override - def apply( - self, - data: torch.Tensor, - *, - torch_rng: torch.Generator | None = None, - ) -> torch.Tensor: - if not isinstance(data, torch.Tensor): - raise TypeError(f"Noise data must be torch.Tensor, got {type(data).__name__}") - if data.ndim != 2 or data.shape[-1] != len(self.ranges): - raise ValueError( - "SegmentwiseUniformNoiseCfg expected a two-dimensional carrier with " - f"{len(self.ranges)} final columns; got {tuple(data.shape)}" - ) - generator = self._require_generator(torch_rng) - if generator.device != data.device: - raise ValueError("Torch noise generator and observation device do not match.") - lower, upper = self._bounds(dtype=data.dtype, device=data.device) - unit = torch.rand( - tuple(data.shape), dtype=data.dtype, device=data.device, generator=generator - ) - return self._apply_noise(data, unit * (upper - lower) + lower) - - -@dataclass -class GaussianNoiseCfg(NoiseCfg): - mean: NoiseParam = 0.0 - std: NoiseParam = 1.0 - # Optional symmetric clamp on the standard-normal draw, in units of sigma - # (e.g. clamp=3.0 bounds the additive noise to ±3*std). None keeps the - # unbounded Gaussian. - clamp: float | None = None - - def __post_init__(self): - if isinstance(self.std, float) and self.std <= 0: - raise ValueError(f"std ({self.std}) must be positive") - if self.clamp is not None: - if isinstance(self.clamp, bool) or not isinstance(self.clamp, (int, float)): - raise TypeError(f"clamp ({self.clamp!r}) must be a real number or None") - if not math.isfinite(self.clamp) or self.clamp <= 0: - raise ValueError(f"clamp ({self.clamp}) must be finite and positive") - - @override - def apply( - self, - data: torch.Tensor, - *, - torch_rng: torch.Generator | None = None, - ) -> torch.Tensor: - if not isinstance(data, torch.Tensor): - raise TypeError(f"Noise data must be torch.Tensor, got {type(data).__name__}") - generator = self._require_generator(torch_rng) - if generator.device != data.device: - raise ValueError("Torch noise generator and observation device do not match.") - mean = self._as_torch(self.mean, dtype=data.dtype, device=data.device) - std = self._as_torch(self.std, dtype=data.dtype, device=data.device) - unit = torch.randn( - tuple(data.shape), dtype=data.dtype, device=data.device, generator=generator - ) - if self.clamp is not None: - unit.clamp_(min=-self.clamp, max=self.clamp) - return self._apply_noise(data, mean + std * unit) - - ## # Noise models. ## diff --git a/src/unilab/managers/action_manager.py b/src/unilab/managers/action_manager.py index e648ee037..b7b28049c 100644 --- a/src/unilab/managers/action_manager.py +++ b/src/unilab/managers/action_manager.py @@ -202,9 +202,6 @@ def reset_finite_verdict(self) -> None: self._finite_verdict.fill_(True) self._finite_bad_rows.zero_() - def clear_finite_verdict(self) -> None: - self.reset_finite_verdict() - def poll_finite_validation(self) -> bool: """Report a deferred action failure at the host validation boundary.""" valid = bool(self._finite_verdict.detach().cpu().item()) @@ -335,15 +332,6 @@ def apply_action(self) -> None: except (TypeError, ValueError, NotImplementedError) as exc: raise type(exc)(f"ActionManager term '{name}': {exc}") from exc - def get_active_iterable_terms(self, env_idx: int) -> Sequence[tuple[str, Sequence[float]]]: - terms = [] - idx = 0 - for name, term in self._terms.items(): - term_actions = self._action[env_idx, idx : idx + term.action_dim] - terms.append((name, term_actions.tolist())) - idx += term.action_dim - return terms - def _prepare_terms(self) -> None: self._term_names: list[str] = list() self._terms: dict[str, ActionTerm] = dict() diff --git a/src/unilab/managers/command_manager.py b/src/unilab/managers/command_manager.py index 1508cd6f2..05317153e 100644 --- a/src/unilab/managers/command_manager.py +++ b/src/unilab/managers/command_manager.py @@ -225,7 +225,7 @@ def _record_metric_finite( for metric_name, metric_value in metric_values: selected = torch.where(reset_mask, metric_value, 0.0) if callable(record): - record(selected, f"command/{self.name}/metric/{metric_name}") + record(selected) elif not _finite(selected): raise ValueError( f"CommandTerm '{self.name}' metric '{metric_name}' contains NaN or Inf." @@ -283,7 +283,7 @@ def compute(self, dt: float | torch.Tensor) -> None: if self._deferred_validation_enabled(): record = getattr(self._env, "record_finite_validation", None) if callable(record): - record(dt_tensor, f"command/{self.name}/dt") + record(dt_tensor) dt_is_finite = True else: dt_is_finite = bool(torch.isfinite(dt_tensor).all()) @@ -337,7 +337,7 @@ def _validate_metrics(self) -> None: record = getattr(self._env, "record_finite_validation", None) if callable(record): for metric_name, metric_value in metric_values: - record(metric_value, f"command/{self.name}/metric/{metric_name}") + record(metric_value) return if metric_values: finite = torch.stack([torch.isfinite(value) for _, value in metric_values]).all() @@ -468,15 +468,6 @@ def poll_finite_validation(self) -> bool: ) raise ValueError("CommandManager returned a non-finite command.") - def get_active_iterable_terms(self, env_idx: int) -> Sequence[tuple[str, Sequence[float]]]: - terms = [] - for name, term in self._terms.items(): - command = self._validate_command(name, term.command) - terms.append((name, command[env_idx].detach().cpu().tolist())) - return terms - - supports_reset_selection = True - def reset_selection_blockers(self) -> list[str]: blockers = selection_blockers("CommandManager", self._terms.items()) if self._terms and not bool(getattr(self._env, "defer_finite_validation", False)): @@ -663,9 +654,6 @@ def __str__(self) -> str: def __repr__(self) -> str: return "NullCommandManager()" - def get_active_iterable_terms(self, env_idx: int) -> Sequence[tuple[str, Sequence[float]]]: - return [] - def reset(self, env_ids: torch.Tensor | None = None) -> dict[str, float]: del env_ids return {} diff --git a/src/unilab/managers/curriculum_manager.py b/src/unilab/managers/curriculum_manager.py index a94ba47d6..5f8ff80d9 100644 --- a/src/unilab/managers/curriculum_manager.py +++ b/src/unilab/managers/curriculum_manager.py @@ -78,25 +78,6 @@ def get_term_cfg(self, term_name: str) -> CurriculumTermCfg: raise ValueError(f"Term '{term_name}' not found in active terms.") return self._term_cfgs[self._term_names.index(term_name)] - def get_active_iterable_terms(self, env_idx: int) -> Sequence[tuple[str, Sequence[float]]]: - terms = [] - for term_name, term_state in self._curriculum_state.items(): - if term_state is not None: - data = [] - if isinstance(term_state, dict): - for _key, value in term_state.items(): - if isinstance(value, torch.Tensor): - value = value.detach().cpu().item() - data.append(value) - else: - if isinstance(term_state, torch.Tensor): - term_state = term_state.detach().cpu().item() - data.append(term_state) - terms.append((term_name, data)) - return terms - - supports_reset_selection = True - def reset_selection_blockers(self) -> list[str]: # Curriculum state is published to the reset log as host scalars, so # configured terms cannot run inside a host-sync-free reset. @@ -188,9 +169,6 @@ def __str__(self) -> str: def __repr__(self) -> str: return "NullCurriculumManager()" - def get_active_iterable_terms(self, env_idx: int) -> Sequence[tuple[str, Sequence[float]]]: - return [] - def reset(self, env_ids: torch.Tensor | None = None) -> dict[str, float]: del env_ids return {} diff --git a/src/unilab/managers/manager_base.py b/src/unilab/managers/manager_base.py index 1ca44af07..46dbdce49 100644 --- a/src/unilab/managers/manager_base.py +++ b/src/unilab/managers/manager_base.py @@ -149,10 +149,6 @@ def reset_selection_blockers(self) -> list[str]: return [] return [f"{type(self).__qualname__}.reset does not accept a ResetSelection"] - def get_active_iterable_terms(self, env_idx: int) -> Sequence[tuple[str, Sequence[float]]]: - """Return ``(term_name, values)`` pairs iterated by the given environment row.""" - raise NotImplementedError - @abc.abstractmethod def _prepare_terms(self) -> None: raise NotImplementedError diff --git a/src/unilab/managers/metrics_manager.py b/src/unilab/managers/metrics_manager.py index c93748849..6ddab9574 100644 --- a/src/unilab/managers/metrics_manager.py +++ b/src/unilab/managers/metrics_manager.py @@ -316,12 +316,6 @@ def compute(self) -> None: if name in self._episode_max: torch.maximum(self._episode_max[name], value, out=self._episode_max[name]) - def get_active_iterable_terms(self, env_idx: int) -> Sequence[tuple[str, Sequence[float]]]: - terms = [] - for idx, name in enumerate(self._term_names): - terms.append((name, [self._step_values[env_idx, idx].item()])) - return terms - def _prepare_terms(self) -> None: for term_name, term_cfg in self.cfg.items(): if term_cfg is None: @@ -394,9 +388,6 @@ def __str__(self) -> str: def __repr__(self) -> str: return "NullMetricsManager()" - def get_active_iterable_terms(self, env_idx: int) -> Sequence[tuple[str, Sequence[float]]]: - return [] - def reset(self, env_ids: torch.Tensor | None = None) -> dict[str, float]: del env_ids return {} diff --git a/src/unilab/managers/observation_manager.py b/src/unilab/managers/observation_manager.py index 1a8d8dff3..32882ac03 100644 --- a/src/unilab/managers/observation_manager.py +++ b/src/unilab/managers/observation_manager.py @@ -274,39 +274,6 @@ def __str__(self) -> str: msg += "\n" return msg - def get_active_iterable_terms(self, env_idx: int) -> Sequence[tuple[str, Sequence[float]]]: - terms = [] - - if self._obs_buffer is None: - self.compute() - assert self._obs_buffer is not None - obs_buffer: dict[str, torch.Tensor | dict[str, torch.Tensor]] = self._obs_buffer - - for group_name, _ in self.group_obs_dim.items(): - if not self.group_obs_concatenate[group_name]: - buffers = obs_buffer[group_name] - assert isinstance(buffers, dict) - for name, term in buffers.items(): - terms.append((group_name + "-" + name, term[env_idx].tolist())) - continue - - idx = 0 - data = obs_buffer[group_name] - assert isinstance(data, torch.Tensor) - for name, shape in zip( - self._group_obs_term_names[group_name], - self._group_obs_term_dim[group_name], - strict=False, - ): - data_length = _shape_product(shape) - term = data[env_idx, idx : idx + data_length] - terms.append((group_name + "-" + name, term.tolist())) - idx += data_length - - return terms - - # Properties. - @property def active_terms(self) -> dict[str, list[str]]: return self._group_obs_term_names @@ -326,9 +293,6 @@ def reset_finite_verdict(self) -> None: for verdict in self._group_finite_verdict.values(): verdict.fill_(True) - def clear_finite_verdict(self) -> None: - self.reset_finite_verdict() - def poll_finite_validation(self) -> bool: """Report deferred observation failures at the host validation boundary.""" valid = bool(self._finite_verdict.detach().cpu().item()) diff --git a/src/unilab/managers/recorder_manager.py b/src/unilab/managers/recorder_manager.py index 149833839..7dfcb2fbe 100644 --- a/src/unilab/managers/recorder_manager.py +++ b/src/unilab/managers/recorder_manager.py @@ -165,10 +165,6 @@ def __str__(self) -> str: table.add_row([idx, name]) return msg + str(table.get_string()) - def __contains__(self, name: str) -> bool: - """Return True if a term named ``name`` is registered.""" - return name in self._terms - @property def active_terms(self) -> list[str]: """List of active term names.""" @@ -254,11 +250,6 @@ def __str__(self) -> str: def __repr__(self) -> str: return "NullRecorderManager()" - def __contains__(self, name: str) -> bool: - """Always returns False since there are no terms.""" - del name - return False - def get_term(self, name: str) -> RecorderTerm: """Always raises KeyError since there are no terms.""" del name diff --git a/src/unilab/managers/reward_manager.py b/src/unilab/managers/reward_manager.py index 38bf0d503..f9924e733 100644 --- a/src/unilab/managers/reward_manager.py +++ b/src/unilab/managers/reward_manager.py @@ -51,7 +51,7 @@ class RewardManager(ManagerBase): - ``reward_buf`` = raw_value * weight (no dt scaling) Regardless of the scaling setting: - - ``_step_reward`` (via ``get_active_iterable_terms()``) always contains + - ``_step_reward`` always contains the unscaled reward rate (raw_value * weight) ``step_reward_extras()`` exposes the latest ``compute()`` call's per-term @@ -127,9 +127,6 @@ def finite_verdict(self) -> torch.Tensor: def reset_finite_verdict(self) -> None: self._finite_verdict.fill_(True) - def clear_finite_verdict(self) -> None: - self.reset_finite_verdict() - def poll_finite_validation(self) -> bool: """Report a deferred reward failure at the host validation boundary.""" valid = bool(self._finite_verdict.detach().cpu().item()) @@ -336,12 +333,6 @@ def step_rewards(self) -> torch.Tensor: """Latest full-width per-term weighted rewards on the Manager device.""" return self._step_reward - def get_active_iterable_terms(self, env_idx: int) -> list[tuple[str, list[float]]]: - terms = [] - for idx, name in enumerate(self._term_names): - terms.append((name, [self._step_reward[env_idx, idx].item()])) - return terms - def get_term_cfg(self, term_name: str) -> RewardTermCfg: if term_name not in self._term_names: raise ValueError(f"Term '{term_name}' not found in active terms.") diff --git a/src/unilab/managers/termination_manager.py b/src/unilab/managers/termination_manager.py index 91c424f8d..9efef5945 100644 --- a/src/unilab/managers/termination_manager.py +++ b/src/unilab/managers/termination_manager.py @@ -86,11 +86,6 @@ def __str__(self) -> str: def active_terms(self) -> list[str]: return self._term_names - @property - def dones(self) -> torch.Tensor: - torch.logical_or(self._truncated_buf, self._terminated_buf, out=self._dones_buf) - return self._dones_buf - @property def time_outs(self) -> torch.Tensor: return self._truncated_buf @@ -206,20 +201,11 @@ def compute(self) -> torch.Tensor: torch.logical_or(self._truncated_buf, self._terminated_buf, out=self._dones_buf) return self._dones_buf - def get_term(self, name: str) -> torch.Tensor: - return self._term_dones[name] - def get_term_cfg(self, term_name: str) -> TerminationTermCfg: if term_name not in self._term_names: raise ValueError(f"Term '{term_name}' not found in active terms.") return self._term_cfgs[self._term_names.index(term_name)] - def get_active_iterable_terms(self, env_idx: int) -> Sequence[tuple[str, Sequence[float]]]: - terms = [] - for key in self._term_dones.keys(): - terms.append((key, [self._term_dones[key][env_idx].item()])) - return terms - def _prepare_terms(self) -> None: for term_name, term_cfg in self.cfg.items(): if term_cfg is None: diff --git a/src/unilab/managers/types.py b/src/unilab/managers/types.py index 906ebc2b1..2821492c5 100644 --- a/src/unilab/managers/types.py +++ b/src/unilab/managers/types.py @@ -496,7 +496,7 @@ def defer_finite_validation(self) -> bool: """Whether finite checks accumulate on the device between polls.""" ... - def record_finite_validation(self, value: torch.Tensor, label: str = "") -> None: + def record_finite_validation(self, value: torch.Tensor) -> None: """Accumulate one finite verdict into the env's deferred poll boundary.""" ... diff --git a/src/unilab/rl/algos/common/actor_factory.py b/src/unilab/rl/algos/common/actor_factory.py index c585b197f..4bade0158 100644 --- a/src/unilab/rl/algos/common/actor_factory.py +++ b/src/unilab/rl/algos/common/actor_factory.py @@ -12,7 +12,6 @@ def build_actor( actor_hidden_dim, use_layer_norm, device, - num_envs=1, actor_num_blocks: int = 2, actor_noise_zeta_mu: float = 2.0, actor_noise_zeta_max: int = 16, diff --git a/src/unilab/rl/logging/__init__.py b/src/unilab/rl/logging/__init__.py index 52795191a..c8c39fabe 100644 --- a/src/unilab/rl/logging/__init__.py +++ b/src/unilab/rl/logging/__init__.py @@ -9,7 +9,6 @@ MetricSpec, ) from unilab.rl.logging.offpolicy import OffPolicyLogger -from unilab.rl.logging.onpolicy import OnPolicyLogger from unilab.rl.logging.trace_event import TraceRecorder __all__ = [ @@ -20,6 +19,5 @@ "MetricFamilySpec", "MetricSpec", "OffPolicyLogger", - "OnPolicyLogger", "TraceRecorder", ] diff --git a/src/unilab/rl/logging/metric_schema.py b/src/unilab/rl/logging/metric_schema.py index 7ad870b07..ab9eb536e 100644 --- a/src/unilab/rl/logging/metric_schema.py +++ b/src/unilab/rl/logging/metric_schema.py @@ -100,10 +100,7 @@ def _collector_ms(tag: str, description: str) -> MetricSpec: ) -_STEP_AXIS = ( - "collector-reported total env steps with iteration fallback for OffPolicyLogger; " - "zero-based iteration for OnPolicyLogger" -) +_STEP_AXIS = "collector-reported total env steps with iteration fallback for OffPolicyLogger" METRIC_SPECS: dict[str, MetricSpec] = { diff --git a/src/unilab/rl/logging/onpolicy.py b/src/unilab/rl/logging/onpolicy.py deleted file mode 100644 index cf36f50f2..000000000 --- a/src/unilab/rl/logging/onpolicy.py +++ /dev/null @@ -1,270 +0,0 @@ -from __future__ import annotations - -from typing import Any - -from rich import box -from rich.console import Group -from rich.panel import Panel -from rich.table import Table -from rich.text import Text - -from unilab.rl.logging.base import ( - BaseTrainingLogger, - _fmt_number, - _load_wandb, - _set_backend_scalar, -) -from unilab.rl.logging.metric_schema import ( - LOGGER_OWNED_METRICS, - normalize_metric_map, - reward_term_key, - validate_metric_tags, -) - - -class OnPolicyLogger(BaseTrainingLogger): - """Rich logger for on-policy RL using upstream RSL-RL's zero-based axis.""" - - def __init__( - self, - algo_name: str = "PPO", - max_iterations: int = 1500, - num_envs: int = 4096, - num_steps: int = 24, - env_name: str = "", - log_dir: str = "", - log_backend: str = "tensorboard", - wandb_project: str = "unilab", - wandb_entity: str | None = None, - wandb_name: str = "", - wandb_group: str | None = None, - wandb_job_type: str | None = None, - wandb_tags: list[str] | None = None, - wandb_notes: str | None = None, - log_interval: int = 1, - ): - super().__init__( - algo_name=algo_name, - max_iterations=max_iterations, - num_envs=num_envs, - env_name=env_name, - log_dir=log_dir, - log_backend=log_backend, - wandb_project=wandb_project, - wandb_entity=wandb_entity, - wandb_name=wandb_name, - wandb_group=wandb_group, - wandb_job_type=wandb_job_type, - wandb_tags=wandb_tags, - wandb_notes=wandb_notes, - tensorboard_subdir="tb", - log_interval=log_interval, - ) - self.num_steps = num_steps - - def start(self, *, status: str = ""): - super().start(status=status) - - def finish(self, *, title: str = "Training Summary", extra_summary: str = ""): - super().finish(title=title, extra_summary=extra_summary) - - def _should_log_backend(self, iteration: int) -> bool: - """Keep the final upstream iteration on the zero-based RSL-RL axis.""" - - final_iteration = max(self.max_iterations - 1, 0) - return iteration % self._log_interval == 0 or iteration >= final_iteration - - def log_step( - self, - iteration: int, - metrics: dict[str, float] | None = None, - return_mean_ep100: float | None = None, - reward_components: dict[str, float] | None = None, - collect_time: float = 0.0, - train_time: float = 0.0, - ): - if metrics: - metrics = normalize_metric_map(metrics) - if "Train/iteration" in metrics: - raise ValueError( - "OnPolicyLogger uses iteration as the step axis; do not emit Train/iteration" - ) - owned = sorted(set(metrics) & LOGGER_OWNED_METRICS) - if owned: - names = ", ".join(owned) - raise ValueError( - f"logger-owned metrics must use dedicated log_step inputs: {names}" - ) - if reward_components: - for component in reward_components: - reward_term_key(component) - self._iteration = iteration - self._collect_time = collect_time - self._train_time = train_time - - if metrics: - self._latest_metrics.update(metrics) - if return_mean_ep100 is not None: - self._reward_history.append(return_mean_ep100) - if reward_components: - self._latest_reward_components = reward_components - - self._refresh() - scalars = self._build_backend_scalars(metrics, return_mean_ep100, reward_components) - if self._should_log_backend(iteration): - self._write_backend_scalars(scalars, iteration) - - def _build_backend_scalars( - self, - metrics: dict[str, float] | None, - return_mean_ep100: float | None, - reward_components: dict[str, float] | None, - ): - scalars: dict[str, Any] = {} - if metrics: - for tag, value in metrics.items(): - _set_backend_scalar(scalars, tag, value) - if return_mean_ep100 is not None: - _set_backend_scalar(scalars, "Train/mean_reward", float(return_mean_ep100)) - if reward_components: - for key, value in reward_components.items(): - _set_backend_scalar(scalars, reward_term_key(key), float(value)) - if self._mean_ep_length > 0: - _set_backend_scalar(scalars, "Train/mean_episode_length", self._mean_ep_length) - iteration_time = self._collect_time + self._train_time - if iteration_time > 0: - throughput = self.num_envs * self.num_steps / iteration_time - _set_backend_scalar(scalars, "Perf/total_fps", throughput) - _set_backend_scalar(scalars, "Perf/collection_time", self._collect_time) - _set_backend_scalar(scalars, "Perf/learning_time", self._train_time) - validate_metric_tags(scalars) - return scalars - - def _write_backend_scalars(self, scalars: dict[str, Any], iteration: int) -> None: - if self._tb_writer: - self._write_tb_scalars(list(scalars.items()), iteration) - - if self._wandb_run: - wandb = _load_wandb() - if wandb is None: - return - wandb.log(scalars, step=iteration) - - def _build_display(self) -> Panel: - header = self._build_compact_header(include_status=True) - left = self._build_metrics_table() - right = self._build_reward_table() - bottom = self._build_timing_table() - grid = Table.grid(expand=True) - grid.add_column(ratio=1) - grid.add_column(width=2) - grid.add_column(ratio=1) - grid.add_row(left, "", right) - return Panel( - Group(header, Text(""), grid, Text(""), bottom), - title=( - "[bold] 🚀 UniLab On-Policy Training [/]" - if self._unicode_console - else "[bold] UniLab On-Policy Training [/]" - ), - border_style="bright_blue", - padding=(0, 1), - ) - - def _build_metrics_table(self) -> Table: - table = Table( - box=box.SIMPLE_HEAVY, - show_header=True, - show_edge=False, - header_style="bold cyan", - expand=True, - pad_edge=False, - ) - table.add_column("Losses & Metrics", style="white", ratio=2) - table.add_column("Value", style="yellow", justify="right", ratio=1) - - if not self._latest_metrics: - table.add_row("[dim]Waiting for data...[/]", "") - else: - loss_keys = sorted([key for key in self._latest_metrics if "loss" in key.lower()]) - other_keys = sorted([key for key in self._latest_metrics if "loss" not in key.lower()]) - for key in loss_keys: - value = self._latest_metrics[key] - style = "red" if value > 10 else "yellow" - table.add_row(key.replace("_", " ").title(), f"[{style}]{_fmt_number(value)}[/]") - for key in other_keys: - value = self._latest_metrics[key] - table.add_row(f" {key.replace('_', ' ').title()}", _fmt_number(value)) - - return table - - def _build_reward_table(self) -> Table: - return self._build_reward_table_common( - wait_message="[dim]Waiting for data...[/]", - include_ep_length=False, - ) - - def _build_timing_table(self) -> Table: - table = Table( - box=box.SIMPLE_HEAVY, - show_header=True, - show_edge=False, - header_style="bold blue", - expand=True, - pad_edge=False, - ) - table.add_column("Learner", style="white", ratio=2, no_wrap=True) - table.add_column("Value", style="yellow", justify="right", ratio=1, no_wrap=True) - table.add_column("Collector", style="white", ratio=2, no_wrap=True) - table.add_column("Value", style="yellow", justify="right", ratio=1, no_wrap=True) - table.add_column("System", style="white", ratio=2, no_wrap=True) - table.add_column("Value", style="yellow", justify="right", ratio=1, no_wrap=True) - - iter_time = self._collect_time + self._train_time - fps = int(self.num_envs * self.num_steps / max(iter_time, 1e-8)) if iter_time > 0 else 0 - - learner_items = [ - ("Train", f"{self._train_time * 1000:.1f}ms"), - ("Iter Time", f"{iter_time * 1000:.1f}ms"), - ] - collector_items = [ - ("Collect", f"{self._collect_time * 1000:.1f}ms"), - ] - system_items = [ - ("Envs", f"{self.num_envs:,}"), - ("Steps/s", f"{fps:,}"), - ] - - row_count = max(len(learner_items), len(collector_items), len(system_items)) - for index in range(row_count): - row: list[str] = [] - for items in (learner_items, collector_items, system_items): - if index < len(items): - row.extend(items[index]) - else: - row.extend(["", ""]) - table.add_row(*row) - - return table - - def _build_compact_header( - self, - *, - include_status: bool, - include_identity: bool = True, - include_iteration: bool = True, - extra_fields: list[tuple[str, str]] | None = None, - ) -> Text: - iter_time = self._collect_time + self._train_time - header_extra_fields: list[tuple[str, str]] = [] - if iter_time > 0: - steps_per_second = self.num_envs * self.num_steps / iter_time - header_extra_fields.append((f"Steps/s {steps_per_second:,.0f}", "bold green")) - if extra_fields: - header_extra_fields.extend(extra_fields) - return super()._build_compact_header( - include_status=include_status, - include_identity=include_identity, - include_iteration=include_iteration, - extra_fields=header_extra_fields, - ) diff --git a/src/unilab/rl/runtime/device.py b/src/unilab/rl/runtime/device.py index f2d72575e..a64a467e0 100644 --- a/src/unilab/rl/runtime/device.py +++ b/src/unilab/rl/runtime/device.py @@ -12,13 +12,12 @@ from __future__ import annotations import time -from collections.abc import Callable from dataclasses import dataclass -from typing import Protocol, cast +from typing import Protocol import torch -from unilab.utils.device import get_default_device, mps_available, xpu_available +from unilab.utils.device import get_default_device __all__ = [ "CudaDeviceTimer", @@ -27,7 +26,6 @@ "device_runtime_capabilities", "get_default_device", "build_device_timer", - "resolve_torch_device_alias", "sync_device", ] @@ -158,96 +156,3 @@ def device_runtime_capabilities(device: str | torch.device) -> DeviceRuntimeCapa stream_sync_api=None, has_timing_events=False, ) - - -def _device_count(device_type: str) -> int | None: - if device_type == "cuda": - return int(torch.cuda.device_count()) - if device_type == "xpu": - xpu = getattr(torch, "xpu", None) - device_count = getattr(xpu, "device_count", None) - if callable(device_count): - return int(cast(Callable[[], int], device_count)()) - return None - - -def _parse_device_alias(value: str) -> tuple[str, int | None]: - raw = value.strip().lower() - if not raw: - raise ValueError("Device alias must not be empty") - if ":" not in raw: - return raw, None - base, index_text = raw.split(":", 1) - if not index_text: - raise ValueError(f"Device alias {value!r} has an empty index") - try: - index = int(index_text) - except ValueError as exc: - raise ValueError(f"Device alias {value!r} has a non-integer index") from exc - if index < 0: - raise ValueError(f"Device alias {value!r} has a negative index") - return base, index - - -def _resolve_indexed_device(device_type: str, index: int | None, original: str) -> str: - count = _device_count(device_type) - if count is not None and index is not None and index >= count: - raise ValueError( - f"Requested device {original!r} resolves to {device_type}:{index}, " - f"but only {count} {device_type} device(s) are available" - ) - return device_type if index is None else f"{device_type}:{index}" - - -def _resolve_mps_alias(index: int | None, original: str) -> str: - if not mps_available(): - raise ValueError(f"Requested device {original!r} requires MPS, but MPS is unavailable") - if index not in (None, 0): - raise ValueError( - f"Requested device {original!r} cannot be mapped to MPS; only index 0 is valid" - ) - return "mps" - - -def resolve_torch_device_alias(device: str | None, *, default: str = "cpu") -> str: - """Resolve a cross-platform torch device alias to a concrete device string. - - ``gpu`` is an abstract accelerator alias and may resolve to an available - accelerator family. ``cuda`` is a concrete device family and fails closed - when CUDA is unavailable. - The function validates the resolved device and never silently falls back to - CPU for unavailable accelerators. - """ - original = default if device is None else str(device) - base, index = _parse_device_alias(original) - - if base == "cpu": - if index is not None: - raise ValueError(f"CPU device {original!r} must not include an index") - return "cpu" - - if base == "mps": - return _resolve_mps_alias(index, original) - - if base == "xpu": - if not xpu_available(): - raise ValueError(f"Requested device {original!r} requires XPU, but XPU is unavailable") - return _resolve_indexed_device("xpu", index, original) - - if base == "cuda": - if torch.cuda.is_available(): - return _resolve_indexed_device("cuda", index, original) - raise ValueError(f"Requested device {original!r} requires CUDA, but CUDA is unavailable") - - if base == "gpu": - if torch.cuda.is_available(): - return _resolve_indexed_device("cuda", index, original) - if xpu_available(): - return _resolve_indexed_device("xpu", index, original) - if mps_available(): - return _resolve_mps_alias(index, original) - raise ValueError( - f"Requested device {original!r} requires an accelerator, but none is available" - ) - - raise ValueError(f"Unsupported device alias {original!r}; expected cpu, gpu, cuda, mps, or xpu") diff --git a/src/unilab/scripts/play_interactive.py b/src/unilab/scripts/play_interactive.py index 8b3e1fb9c..9b1ecb9e0 100644 --- a/src/unilab/scripts/play_interactive.py +++ b/src/unilab/scripts/play_interactive.py @@ -809,7 +809,7 @@ def _create_env(num_envs: int): env_cfg_override = build_offpolicy_env_cfg_override(algo, cfg, root_dir=Path.cwd()) else: env_cfg_override = build_play_backend_adapter( - cfg, root_dir=Path.cwd(), algo_name=algo + cfg, root_dir=Path.cwd() ).build_task_env_cfg_override() env_cfg_override = apply_backend_env_device_override( env_cfg_override, diff --git a/src/unilab/scripts/train_appo.py b/src/unilab/scripts/train_appo.py index 23e2e373c..161d87c9a 100644 --- a/src/unilab/scripts/train_appo.py +++ b/src/unilab/scripts/train_appo.py @@ -234,7 +234,7 @@ def play_appo( if bound_device is not None: device = bound_device play_env_cfg_override = apply_backend_env_device_override( - EnvConfigAdapter(cfg, root_dir=Path.cwd(), algo_name="appo").build_play_env_cfg_override(), + EnvConfigAdapter(cfg, root_dir=Path.cwd()).build_play_env_cfg_override(), str(cfg.training.sim_backend), learner_device=device, ) @@ -373,7 +373,7 @@ def main(cfg: DictConfig) -> None: collector_device = bound_device env_cfg_override = apply_backend_env_device_override( - EnvConfigAdapter(cfg, root_dir=Path.cwd(), algo_name="appo").build_task_env_cfg_override(), + EnvConfigAdapter(cfg, root_dir=Path.cwd()).build_task_env_cfg_override(), str(cfg.training.sim_backend), learner_device=_env_carrier_device(cfg, collector_device, runner_device=learner_device), ) diff --git a/src/unilab/scripts/train_rsl_rl.py b/src/unilab/scripts/train_rsl_rl.py index 4a1f16b04..575f0d604 100644 --- a/src/unilab/scripts/train_rsl_rl.py +++ b/src/unilab/scripts/train_rsl_rl.py @@ -56,7 +56,7 @@ patch_rsl_rl_tensorboard_logging, patch_rsl_rl_wandb_writer, ) -from unilab.training.run import reject_removed_validation_keys +from unilab.training.run import reject_removed_ppo_resume_keys, reject_removed_validation_keys from unilab.training.seed import apply_configured_training_seed from unilab.training.tensor_runtime import ( resolve_recorded_collector_tensor_device, @@ -86,7 +86,6 @@ def _backend_adapter(cfg: DictConfig) -> EnvConfigAdapter: return EnvConfigAdapter( cfg, root_dir=Path.cwd(), - algo_name="ppo", scene_materializer=materialize_scene_visual_override, ) @@ -382,6 +381,7 @@ def main(cfg: DictConfig) -> None: "select one device" ) validate_ppo_run_completion_topology(cfg, world_size=world_size) + reject_removed_ppo_resume_keys(cfg) if world_size > 1 and os.environ.get("LOCAL_RANK") == "0": # A launcher parent invokes this branch once. World size comes from the diff --git a/src/unilab/structured_configs.py b/src/unilab/structured_configs.py index 9f5b69bf1..b77158545 100644 --- a/src/unilab/structured_configs.py +++ b/src/unilab/structured_configs.py @@ -407,18 +407,12 @@ class PPOConfig(BaseConfig): save_interval: int = 100 # Observation group assignment per network input. obs_groups: dict = field(default_factory=lambda: {"actor": ["policy"]}) - # Experiment name used for run directories. - experiment_name: str = "test" - # Optional run name suffix. - run_name: str = "" # Resume training from a checkpoint. resume: bool = False # Run directory to load from; -1 selects the most recent. load_run: str = "-1" # Checkpoint iteration to load; -1 selects the latest. checkpoint: int = -1 - # Explicit checkpoint path overriding run/checkpoint selection. - resume_path: Optional[str] = None # Actor network configuration. actor: PPOActorConfig = field(default_factory=PPOActorConfig) # Critic network configuration. diff --git a/src/unilab/tasks/locomotion/go2/tensor_parity.py b/src/unilab/tasks/locomotion/go2/tensor_parity.py deleted file mode 100644 index 5be5a6b99..000000000 --- a/src/unilab/tasks/locomotion/go2/tensor_parity.py +++ /dev/null @@ -1,440 +0,0 @@ -"""Minimal tensor parity runtime for the canonical Go2 joystick-flat owner. - -This module is an M9 contract pilot only. It is intentionally not registered as a -production backend and does not change any backend support claim. The runtime -negotiates UniSim's public tensor lifecycle and keeps the canonical Go2 - observation, reward, termination, and mask-reset equations tensor-native. -""" - -from __future__ import annotations - -from dataclasses import dataclass -from typing import Any - -import torch -from unisim.backend.base import SimBackend, TensorExecution, torch_device_matches - -GO2_JOINT_NAMES: tuple[str, ...] = ( - "FL_hip_joint", - "FL_thigh_joint", - "FL_calf_joint", - "FR_hip_joint", - "FR_thigh_joint", - "FR_calf_joint", - "RL_hip_joint", - "RL_thigh_joint", - "RL_calf_joint", - "RR_hip_joint", - "RR_thigh_joint", - "RR_calf_joint", -) -GO2_ACTUATOR_NAMES: tuple[str, ...] = ( - "FR_hip", - "FR_thigh", - "FR_calf", - "FL_hip", - "FL_thigh", - "FL_calf", - "RR_hip", - "RR_thigh", - "RR_calf", - "RL_hip", - "RL_thigh", - "RL_calf", -) -_JOINT_TO_ACTUATOR: tuple[int, ...] = tuple( - GO2_ACTUATOR_NAMES.index(name.removesuffix("_joint")) for name in GO2_JOINT_NAMES -) -_DEFAULT_JOINT_POS: tuple[float, ...] = ( - 0.0, - 0.8, - -1.5, - 0.0, - 0.8, - -1.5, - 0.0, - 1.0, - -1.5, - 0.0, - 1.0, - -1.5, -) -_FOOT_CONTACT_SENSOR_NAMES: tuple[str, ...] = ( - "FL_foot_contact", - "FR_foot_contact", - "RL_foot_contact", - "RR_foot_contact", -) -_FOOT_POSITION_SENSOR_NAMES: tuple[str, ...] = ("FL_pos", "FR_pos", "RL_pos", "RR_pos") -_SENSOR_NAMES: tuple[str, ...] = ( - "gyro", - "local_linvel", - "upvector", - *_FOOT_CONTACT_SENSOR_NAMES, - *_FOOT_POSITION_SENSOR_NAMES, -) -_GAIT_OFFSETS: tuple[float, ...] = (0.0, 0.5, 0.5, 0.0) - - -@dataclass(frozen=True) -class Go2ParityConfig: - """Numerical parameters of the canonical DR-free Go2 parity owner.""" - - action_scale: float = 0.25 - ctrl_dt: float = 0.02 - max_episode_steps: int = 1_000 - gait_frequency: float = 2.0 - tracking_lin_vel_std: float = 0.5 - tracking_ang_vel_std: float = 0.5 - base_height_target: float = 0.3 - foot_target_height: float = 0.1 - foot_height_kernel: float = 0.01 - swing_start: float = 0.6 - contact_threshold: float = 0.1 - stance_threshold: float = 0.6 - bad_orientation_limit: float = 1.0471975511965976 - tracking_lin_vel_weight: float = 1.0 - tracking_ang_vel_weight: float = 0.2 - lin_vel_z_weight: float = -5.0 - ang_vel_xy_weight: float = -0.1 - base_height_weight: float = -100.0 - action_rate_weight: float = -0.005 - joint_deviation_weight: float = -0.1 - contact_weight: float = 0.24 - swing_feet_weight: float = 4.0 - - -@dataclass -class Go2ParityState: - """Torch state returned by the Go2 parity pilot.""" - - obs: dict[str, torch.Tensor] - reward: torch.Tensor - terminated: torch.Tensor - truncated: torch.Tensor - info: dict[str, Any] - - -class Go2ParityRuntime: - """Exercise the canonical Go2 equations through public backend tensor APIs.""" - - def __init__( - self, - backend: SimBackend, - *, - command: torch.Tensor, - reset_qpos: torch.Tensor, - reset_qvel: torch.Tensor, - device: str | torch.device = "cpu", - cfg: Go2ParityConfig = Go2ParityConfig(), - ): - self.backend = backend - self.cfg = cfg - self.device = torch.device(device) - if self.device.type == "cuda": - if not torch.cuda.is_available(): - raise RuntimeError("CUDA Go2 tensor parity requested but CUDA is unavailable") - if self.device.index is None: - self.device = torch.device("cuda", index=torch.cuda.current_device()) - self._negotiate_backend() - self.num_envs = int(backend.num_envs) - self.num_joints = len(GO2_JOINT_NAMES) - if backend.num_actuators != self.num_joints: - raise ValueError( - f"Go2 parity backend must expose {self.num_joints} actuators; " - f"received {backend.num_actuators}" - ) - - state_views = backend.get_state_views(("qpos", "qvel"), device=self.device) - self._qpos = self._require_tensor(state_views.get("qpos"), "qpos") - self._qvel = self._require_tensor(state_views.get("qvel"), "qvel") - expected_qpos = (self.num_envs, 7 + self.num_joints) - expected_qvel = (self.num_envs, 6 + self.num_joints) - if self._qpos.shape != expected_qpos: - raise ValueError( - f"Go2 qpos view shape is {tuple(self._qpos.shape)}, not {expected_qpos}" - ) - if self._qvel.shape != expected_qvel: - raise ValueError( - f"Go2 qvel view shape is {tuple(self._qvel.shape)}, not {expected_qvel}" - ) - - self.sensors = { - name: self._require_tensor(backend.get_sensor_view(name, self.device), name) - for name in _SENSOR_NAMES - } - expected_sensor_shapes = { - "gyro": (self.num_envs, 3), - "local_linvel": (self.num_envs, 3), - "upvector": (self.num_envs, 3), - **{name: (self.num_envs, 1) for name in _FOOT_CONTACT_SENSOR_NAMES}, - **{name: (self.num_envs, 3) for name in _FOOT_POSITION_SENSOR_NAMES}, - } - for name, view in self.sensors.items(): - if view.shape != expected_sensor_shapes[name]: - raise ValueError( - f"Go2 sensor {name!r} shape is {tuple(view.shape)}, " - f"expected {expected_sensor_shapes[name]}" - ) - - self.command = self._require_input(command, "command", (self.num_envs, 3)) - self.reset_qpos = self._require_input( - reset_qpos, "reset_qpos", (self.num_envs, 7 + self.num_joints) - ) - self.reset_qvel = self._require_input( - reset_qvel, "reset_qvel", (self.num_envs, 6 + self.num_joints) - ) - - self._default_joint_pos = torch.tensor( - _DEFAULT_JOINT_POS, dtype=torch.float32, device=self.device - ).repeat(self.num_envs, 1) - self._default_joint_vel = torch.zeros_like(self._default_joint_pos) - joint_to_actuator = torch.tensor(_JOINT_TO_ACTUATOR, dtype=torch.int64, device=self.device) - self._default_ctrl = self._default_joint_pos.index_select(1, joint_to_actuator) - self._gait_offsets = torch.tensor( - _GAIT_OFFSETS, dtype=torch.float32, device=self.device - ).repeat(self.num_envs, 1) - self._raw_actions = torch.zeros_like(self._default_ctrl) - self._previous_raw_actions = torch.zeros_like(self._raw_actions) - self._ctrl = torch.zeros_like(self._default_ctrl) - self._steps = torch.zeros((self.num_envs,), dtype=torch.int64, device=self.device) - self._phase = torch.zeros((self.num_envs,), dtype=torch.float32, device=self.device) - self._obs = { - "policy": torch.empty((self.num_envs, 49), dtype=torch.float32, device=self.device), - "critic": torch.empty((self.num_envs, 52), dtype=torch.float32, device=self.device), - } - self.reward_components = { - name: torch.empty((self.num_envs,), dtype=torch.float32, device=self.device) - for name in ( - "tracking_lin_vel", - "tracking_ang_vel", - "lin_vel_z", - "ang_vel_xy", - "base_height", - "action_rate", - "similar_to_default", - "contact", - "swing_feet_z", - ) - } - - def _negotiate_backend(self) -> None: - capabilities = self.backend.get_tensor_capabilities() - execution = capabilities.execution - if execution is not TensorExecution.DEVICE_RESIDENT: - raise RuntimeError( - "Go2 tensor parity runtime requires a DEVICE_RESIDENT backend; " - f"received {execution!r}" - ) - if self.backend.get_tensor_execution() is not execution: - raise RuntimeError("backend tensor execution does not match its capabilities") - missing_fields = {"qpos", "qvel"} - set(capabilities.state_fields) - if missing_fields: - raise RuntimeError(f"backend tensor state fields are missing: {sorted(missing_fields)}") - if not capabilities.state_views: - raise RuntimeError("backend did not negotiate tensor state views") - if not capabilities.sensor_views: - raise RuntimeError("backend did not negotiate tensor sensor views") - if not capabilities.stepping: - raise RuntimeError("backend did not negotiate tensor stepping") - if not capabilities.selected_reset: - raise RuntimeError("backend did not negotiate selected tensor reset") - if not capabilities.mask_selected_reset: - raise RuntimeError("backend did not negotiate mask tensor reset") - if not torch_device_matches( - capabilities.torch_devices, - self.device, - current_device=self.device.index, - ): - raise RuntimeError( - f"backend did not accept Torch device {str(self.device)!r}; " - f"supported devices are {capabilities.torch_devices}" - ) - - def _require_tensor(self, value: Any, name: str) -> torch.Tensor: - if not isinstance(value, torch.Tensor): - raise TypeError(f"backend tensor view {name!r} did not return a Torch tensor") - if value.device != self.device: - raise RuntimeError(f"backend tensor view {name!r} lives on {value.device}") - if value.dtype is not torch.float32: - raise TypeError(f"backend tensor view {name!r} must be float32, got {value.dtype}") - return value - - def _require_input(self, value: Any, name: str, shape: tuple[int, ...]) -> torch.Tensor: - if not isinstance(value, torch.Tensor): - raise TypeError(f"{name} must be a Torch tensor") - if value.shape != shape: - raise ValueError(f"{name} shape is {tuple(value.shape)}, expected {shape}") - if value.device != self.device: - raise ValueError(f"{name} lives on {value.device}, expected {self.device}") - if value.dtype is not torch.float32: - raise TypeError(f"{name} must be float32, got {value.dtype}") - if not value.is_contiguous(): - raise ValueError(f"{name} must be contiguous") - if not bool(torch.isfinite(value).all()): - raise ValueError(f"{name} contains NaN or Inf") - return value - - def _validate_actions(self, actions: torch.Tensor) -> torch.Tensor: - return self._require_input(actions, "actions", (self.num_envs, self.num_joints)) - - def _validate_reset_mask(self, reset_mask: torch.Tensor) -> torch.Tensor: - if reset_mask.dtype is not torch.bool or reset_mask.ndim != 1: - raise TypeError("reset mask must be a one-dimensional bool tensor") - if reset_mask.device != self.device: - raise ValueError(f"reset mask lives on {reset_mask.device}, expected {self.device}") - if reset_mask.shape != (self.num_envs,): - raise ValueError( - f"reset mask shape is {tuple(reset_mask.shape)}, expected {(self.num_envs,)}" - ) - return reset_mask - - def reset(self, reset_mask: torch.Tensor | None = None) -> dict[str, torch.Tensor]: - mask = ( - torch.ones(self.num_envs, dtype=torch.bool, device=self.device) - if reset_mask is None - else self._validate_reset_mask(reset_mask) - ) - result = self.backend.set_state_tensor_mask(mask, self.reset_qpos, self.reset_qvel) - if result is not None and not isinstance(result, dict): - raise TypeError("backend tensor reset must return a dict or None") - action_mask = mask[:, None] - self._raw_actions.masked_fill_(action_mask, 0.0) - self._previous_raw_actions.masked_fill_(action_mask, 0.0) - self._steps.masked_fill_(mask, 0) - self._phase.masked_fill_(mask, 0.0) - self._update_observation() - return {name: values.clone() for name, values in self._obs.items()} - - def step(self, actions: torch.Tensor, nsteps: int = 2) -> Go2ParityState: - actions = self._validate_actions(actions) - if isinstance(nsteps, bool) or int(nsteps) != nsteps or int(nsteps) <= 0: - raise ValueError("nsteps must be a positive integer") - self._previous_raw_actions.copy_(self._raw_actions) - self._raw_actions.copy_(actions) - self._ctrl.copy_(self._default_ctrl) - self._ctrl.add_(self._raw_actions, alpha=self.cfg.action_scale) - result = self.backend.step_tensor(self._ctrl, int(nsteps)) - if result is not None and not isinstance(result, dict): - raise TypeError("backend tensor step must return a dict or None") - - self._steps += 1 - self._phase = torch.remainder( - self._phase + self.cfg.ctrl_dt * self.cfg.gait_frequency, - 1.0, - ) - terminated = self._compute_terminated() - truncated = self._compute_truncated() - self._update_observation() - self._compute_rewards() - - reward = torch.zeros((self.num_envs,), dtype=torch.float32, device=self.device) - weights = { - "tracking_lin_vel": self.cfg.tracking_lin_vel_weight, - "tracking_ang_vel": self.cfg.tracking_ang_vel_weight, - "lin_vel_z": self.cfg.lin_vel_z_weight, - "ang_vel_xy": self.cfg.ang_vel_xy_weight, - "base_height": self.cfg.base_height_weight, - "action_rate": self.cfg.action_rate_weight, - "similar_to_default": self.cfg.joint_deviation_weight, - "contact": self.cfg.contact_weight, - "swing_feet_z": self.cfg.swing_feet_weight, - } - for name, weight in weights.items(): - reward.add_(self.reward_components[name], alpha=weight * self.cfg.ctrl_dt) - return Go2ParityState( - obs=self._obs, - reward=reward, - terminated=terminated, - truncated=truncated, - info={"steps": self._steps.clone()}, - ) - - def _compute_terminated(self) -> torch.Tensor: - upvector_z = self.sensors["upvector"][:, 2].clamp(-1.0, 1.0) - angle = torch.arccos(upvector_z) - return angle > self.cfg.bad_orientation_limit - - def _compute_truncated(self) -> torch.Tensor: - return self._steps >= self.cfg.max_episode_steps - - def _update_observation(self) -> None: - joint_pos = self._qpos[:, 7:] - joint_vel = self._qvel[:, 6:] - phase = torch.remainder(self._phase[:, None] + self._gait_offsets, 1.0) - policy_parts = ( - self.sensors["gyro"], - -self.sensors["upvector"], - joint_pos - self._default_joint_pos, - joint_vel - self._default_joint_vel, - self._raw_actions, - self.command, - phase, - ) - policy = torch.cat(policy_parts, dim=1) - if policy.shape != (self.num_envs, 49): - raise RuntimeError(f"Go2 policy observation width is {policy.shape[1]}, expected 49") - self._obs["policy"].copy_(policy) - self._obs["critic"].copy_(torch.cat((policy, self.sensors["local_linvel"]), dim=1)) - - def _compute_rewards(self) -> None: - lin_vel = self.sensors["local_linvel"] - gyro = self.sensors["gyro"] - joint_pos = self._qpos[:, 7:] - foot_heights = torch.stack( - [self.sensors[name][:, 2] for name in _FOOT_POSITION_SENSOR_NAMES], dim=1 - ) - contacts = torch.cat([self.sensors[name] for name in _FOOT_CONTACT_SENSOR_NAMES], dim=1) - phases = torch.remainder(self._phase[:, None] + self._gait_offsets, 1.0) - - lin_error = torch.sum(torch.square(self.command[:, :2] - lin_vel[:, :2]), dim=1) - torch.exp( - -lin_error / self.cfg.tracking_lin_vel_std**2, - out=self.reward_components["tracking_lin_vel"], - ) - ang_error = torch.square(self.command[:, 2] - gyro[:, 2]) - torch.exp( - -ang_error / self.cfg.tracking_ang_vel_std**2, - out=self.reward_components["tracking_ang_vel"], - ) - torch.square(lin_vel[:, 2], out=self.reward_components["lin_vel_z"]) - torch.sum(torch.square(gyro[:, :2]), dim=1, out=self.reward_components["ang_vel_xy"]) - torch.square( - self._qpos[:, 2] - self.cfg.base_height_target, - out=self.reward_components["base_height"], - ) - torch.sum( - torch.square(self._raw_actions - self._previous_raw_actions), - dim=1, - out=self.reward_components["action_rate"], - ) - torch.sum( - torch.abs(joint_pos - self._default_joint_pos), - dim=1, - out=self.reward_components["similar_to_default"], - ) - contact_active = contacts > self.cfg.contact_threshold - expected_contact = phases < self.cfg.stance_threshold - torch.mean( - (contact_active == expected_contact).to(torch.float32), - dim=1, - out=self.reward_components["contact"], - ) - swing = phases >= self.cfg.swing_start - height_reward = torch.exp( - -torch.square(foot_heights - self.cfg.foot_target_height) / self.cfg.foot_height_kernel - ) - torch.mean( - height_reward * swing, - dim=1, - out=self.reward_components["swing_feet_z"], - ) - - -__all__ = [ - "GO2_ACTUATOR_NAMES", - "GO2_JOINT_NAMES", - "Go2ParityConfig", - "Go2ParityRuntime", - "Go2ParityState", -] diff --git a/src/unilab/tasks/motion_tracking/common/manager_terms.py b/src/unilab/tasks/motion_tracking/common/manager_terms.py index ef651ab31..75c7125bb 100644 --- a/src/unilab/tasks/motion_tracking/common/manager_terms.py +++ b/src/unilab/tasks/motion_tracking/common/manager_terms.py @@ -394,7 +394,7 @@ def _bind_compiled_motion_post_compute() -> _MotionPostComputeFn: from unilab.managers.types import ManagerBasedRlEnv -SamplingMode = Literal["start", "clip_start", "uniform", "adaptive", "mixed"] +SamplingMode = Literal["adaptive", "mixed"] _RANGE_KEYS = ("x", "y", "z", "roll", "pitch", "yaw") _DEFAULT_ASSET_CFG = SceneEntityCfg("robot") @@ -442,7 +442,7 @@ def _validate_motion_command_cfg(cfg: MotionCommandCfg) -> None: raise ValueError("MotionCommandCfg anchor_body_name must occur in body_names") if len(set(cfg.body_names)) != len(cfg.body_names): raise ValueError("MotionCommandCfg body_names must be unique") - if cfg.sampling_mode not in ("start", "clip_start", "uniform", "adaptive", "mixed"): + if cfg.sampling_mode not in ("adaptive", "mixed"): raise ValueError(f"MotionCommandCfg has unsupported sampling_mode {cfg.sampling_mode!r}") if not 0.0 <= cfg.params.sampling_start_ratio <= 1.0: raise ValueError("MotionCommandCfg sampling_start_ratio must be within [0, 1]") diff --git a/src/unilab/tasks/motion_tracking/common/motion_loader.py b/src/unilab/tasks/motion_tracking/common/motion_loader.py index 4191113c2..1d3e0d57a 100644 --- a/src/unilab/tasks/motion_tracking/common/motion_loader.py +++ b/src/unilab/tasks/motion_tracking/common/motion_loader.py @@ -272,11 +272,6 @@ def _normalize_motion_files(motion_file: str | Sequence[str]) -> tuple[str, ...] raise ValueError("motion_file entries must be non-empty strings") return motion_files - def get_clip_indices(self, frame_idx: np.ndarray) -> np.ndarray: - """Map global frame indices to clip indices.""" - clip_indices = np.searchsorted(self.clip_offsets, frame_idx, side="right") - 1 - return np.asarray(clip_indices, dtype=np.int32) - def motion_features_torch(self, device: str | torch.device) -> torch.Tensor: """Return the immutable motion feature table on the requested device. diff --git a/src/unilab/tasks/motion_tracking/common/tensor_runtime.py b/src/unilab/tasks/motion_tracking/common/tensor_runtime.py deleted file mode 100644 index 3cc327842..000000000 --- a/src/unilab/tasks/motion_tracking/common/tensor_runtime.py +++ /dev/null @@ -1,211 +0,0 @@ -"""Reusable tensor-runtime pieces for motion-tracking task owners. - -These helpers deliberately do not construct environments or discover backend -capabilities. A task owner remains responsible for validating its semantic -contract and negotiating UniSim's public tensor lifecycle before using them. -""" - -from __future__ import annotations - -import hashlib -from dataclasses import dataclass, field, is_dataclass -from dataclasses import fields as dataclass_fields -from typing import Any, Mapping - -import torch - -from unilab.managers._noise.noise_cfg import UniformNoiseCfg - - -def _qualified_name(value: Any) -> str: - if isinstance(value, type): - return f"{value.__module__}.{value.__qualname__}" - return f"{type(value).__module__}.{type(value).__qualname__}" - - -def _finite_float(value: float) -> bool: - return value == value and value not in {float("inf"), float("-inf")} - - -def semantic_token(value: Any) -> Any: - """Normalize an owner configuration value without unknown escapes.""" - if value is None: - return "none" - if isinstance(value, slice): - return "slice", value.start, value.stop, value.step - if is_dataclass(value) and not isinstance(value, type): - excluded = {"fixed_variant_plan"} if type(value).__name__ == "SceneCfg" else set() - excluded |= getattr(value, "_semantic_fingerprint_excludes", frozenset()) - return ( - _qualified_name(value), - tuple( - (item.name, semantic_token(getattr(value, item.name))) - for item in dataclass_fields(value) - if item.name not in excluded - ), - ) - if isinstance(value, (str, bytes, bool, int, float)): - if isinstance(value, float) and not _finite_float(value): - raise ValueError("tensor task owner identity contains a non-finite scalar") - return type(value).__name__, value - if isinstance(value, Mapping): - return tuple((str(key), semantic_token(item)) for key, item in value.items()) - if isinstance(value, (list, tuple)): - return tuple(semantic_token(item) for item in value) - if isinstance(value, (set, frozenset)): - return tuple(sorted((semantic_token(item) for item in value), key=repr)) - if callable(value): - return "callable", _qualified_name(value) - raise TypeError(f"unsupported tensor task owner identity value: {_qualified_name(value)}") - - -def semantic_fingerprint(domain: str, value: Any) -> str: - """Return a stable SHA-256 fingerprint for a task-owner semantic token.""" - if not domain: - raise ValueError("tensor task semantic fingerprint domain must be non-empty") - token = semantic_token((domain, value)) - return hashlib.sha256(repr(token).encode("utf-8")).hexdigest() - - -@dataclass(frozen=True) -class ObservationNoise: - """Uniform additive observation noise with owner-declared bounds.""" - - lower: torch.Tensor - upper: torch.Tensor - - def __post_init__(self) -> None: - if self.lower.shape != self.upper.shape or self.lower.ndim != 1: - raise ValueError("observation noise bounds must be matching one-dimensional tensors") - if self.lower.device != self.upper.device: - raise ValueError("observation noise bounds must live on one device") - if self.lower.numel() == 0: - raise ValueError("observation noise bounds cannot be empty") - if not bool(torch.isfinite(self.lower).all() and torch.isfinite(self.upper).all()): - raise ValueError("observation noise bounds must be finite") - if bool((self.upper < self.lower).any()): - raise ValueError("observation noise upper bounds must not be below lower bounds") - - @classmethod - def from_uniform_terms( - cls, - terms: tuple[UniformNoiseCfg, ...], - widths: tuple[int, ...], - device: torch.device, - ) -> ObservationNoise: - if len(terms) != len(widths) or not terms or min(widths) <= 0: - raise ValueError("observation noise terms and widths must be non-empty and aligned") - lower_values = tuple(term.n_min for term in terms if isinstance(term.n_min, float)) - upper_values = tuple(term.n_max for term in terms if isinstance(term.n_max, float)) - if len(lower_values) != len(terms) or len(upper_values) != len(terms): - raise TypeError("motion-tracking tensor runtime requires scalar uniform noise bounds") - if any(not _finite_float(value) for value in (*lower_values, *upper_values)): - raise ValueError("observation noise bounds must be finite") - if any(upper < lower for lower, upper in zip(lower_values, upper_values)): - raise ValueError("observation noise upper bounds must not be below lower bounds") - width_tensor = torch.tensor(widths, device=device, dtype=torch.int64) - lower = torch.tensor(lower_values, device=device, dtype=torch.float32).repeat_interleave( - width_tensor - ) - upper = torch.tensor(upper_values, device=device, dtype=torch.float32).repeat_interleave( - width_tensor - ) - return cls(lower, upper) - - def apply( - self, - observations: torch.Tensor, - *, - cursor: int, - generator: torch.Generator, - ) -> torch.Tensor: - width = self.lower.numel() - if cursor < 0 or cursor + width > observations.shape[-1]: - raise ValueError("observation noise range does not fit the observation tensor") - noise = torch.rand( - (*observations.shape[:-1], width), device=self.lower.device, generator=generator - ) - observations[..., cursor : cursor + width] += noise * (self.upper - self.lower) + self.lower - return observations - - -@dataclass -class ResetMasks: - """Device-side fixed-width done union.""" - - terminated: torch.Tensor - truncated: torch.Tensor - - def __post_init__(self) -> None: - if self.terminated.shape != self.truncated.shape or self.terminated.ndim != 1: - raise ValueError("tensor reset masks must be matching one-dimensional tensors") - if self.terminated.dtype != torch.bool or self.truncated.dtype != torch.bool: - raise TypeError("tensor reset masks must be boolean tensors") - if self.terminated.device != self.truncated.device: - raise ValueError("tensor reset masks must live on one device") - - @property - def done(self) -> torch.Tensor: - return self.terminated | self.truncated - - -@dataclass -class EpisodeMetrics: - """Device-resident current episode accumulators. - - ``snapshot`` and ``finished_values`` return tensors; callers decide when a - logging or IPC boundary is allowed to copy them to host. - """ - - rewards: torch.Tensor - lengths: torch.Tensor - - @classmethod - def create(cls, num_envs: int, device: torch.device) -> EpisodeMetrics: - if num_envs <= 0: - raise ValueError("tensor episode metrics require a positive environment count") - return cls( - rewards=torch.zeros(num_envs, dtype=torch.float32, device=device), - lengths=torch.zeros(num_envs, dtype=torch.int64, device=device), - ) - - def update(self, reward: torch.Tensor, done: torch.Tensor) -> None: - if reward.shape != done.shape or reward.shape != self.rewards.shape: - raise ValueError("episode metric tensors must have environment shape") - if done.dtype != torch.bool: - raise TypeError("episode metric done values must be a boolean tensor") - # The reward argument is the terminal transition reward. Include it, - # capture finished rows, and only then reset those rows. - self.rewards += reward - self.lengths += 1 - - def finished_values(self, done_mask: torch.Tensor) -> torch.Tensor: - if done_mask.shape != self.rewards.shape or done_mask.dtype != torch.bool: - raise ValueError("episode metric finished mask must be full-width bool") - return torch.stack( - ( - torch.where(done_mask, self.rewards, torch.zeros_like(self.rewards)).to( - torch.float64 - ), - torch.where(done_mask, self.lengths, torch.zeros_like(self.lengths)).to( - torch.float64 - ), - ), - dim=1, - ) - - def reset(self, done_mask: torch.Tensor) -> None: - self.rewards.masked_fill_(done_mask, 0.0) - self.lengths.masked_fill_(done_mask, 0) - - def snapshot(self) -> dict[str, torch.Tensor]: - return {"reward": self.rewards, "length": self.lengths} - - -__all__ = [ - "EpisodeMetrics", - "ObservationNoise", - "ResetMasks", - "semantic_fingerprint", - "semantic_token", -] diff --git a/src/unilab/tasks/motion_tracking/common/tensor_state_store.py b/src/unilab/tasks/motion_tracking/common/tensor_state_store.py deleted file mode 100644 index 5f86629c5..000000000 --- a/src/unilab/tasks/motion_tracking/common/tensor_state_store.py +++ /dev/null @@ -1,334 +0,0 @@ -"""Device-resident robot state reads for tensor motion-tracking owners. - -The store consumes only ``SimBackend`` public tensor APIs. It owns stable view -negotiation and full/selected-row ingestion, while task owners remain responsible -for their semantic contracts and downstream finite checks. -""" - -from __future__ import annotations - -from typing import cast - -import torch -from unisim.backend.base import ( - HostBridgeTransferPlan, - SimBackend, - TensorExecution, - TensorIOSpec, - torch_device_matches, -) - - -class DeviceStateStore: - """Read qpos/qvel, scalar sensors, and tracked body state on one device.""" - - def __init__( - self, - *, - backend: SimBackend, - device: torch.device, - num_envs: int, - joint_qpos_ids: torch.Tensor, - joint_qvel_ids: torch.Tensor, - body_names: tuple[str, ...], - body_ids: torch.Tensor, - ) -> None: - if min(num_envs, len(body_names)) <= 0: - raise ValueError("tensor state store dimensions must be positive") - if joint_qpos_ids.shape != joint_qvel_ids.shape or joint_qpos_ids.ndim != 1: - raise ValueError("tensor state joint indices must be aligned one-dimensional arrays") - if body_ids.shape != (len(body_names),): - raise ValueError("tensor state body IDs must match the body layout") - self.backend = backend - self.device = torch.device(device) - self.num_envs = int(num_envs) - self.joint_qpos_ids = joint_qpos_ids.to(device=torch.device("cpu"), dtype=torch.int64) - self.joint_qvel_ids = joint_qvel_ids.to(device=torch.device("cpu"), dtype=torch.int64) - self.body_names = tuple(body_names) - self.body_ids = body_ids.to(device=torch.device("cpu"), dtype=torch.int64) - - self.device = torch.device(device) - if self.device.type == "cuda": - if not torch.cuda.is_available(): - raise RuntimeError("CUDA tensor state storage requested but CUDA is unavailable") - if self.device.index is None: - self.device = torch.device("cuda", index=torch.cuda.current_device()) - - capabilities = self.backend.get_tensor_capabilities() - self._execution = capabilities.execution - if self._execution is TensorExecution.UNSUPPORTED: - raise RuntimeError( - "Tensor state store requires a DEVICE_RESIDENT or HOST_BRIDGE backend" - ) - if not torch_device_matches(capabilities.torch_devices, self.device): - raise RuntimeError( - f"backend did not accept Tensor device {str(self.device)!r}; " - f"supported devices are {capabilities.torch_devices}" - ) - - joint_shape = (self.num_envs, self.joint_qpos_ids.numel()) - body_shape = (self.num_envs, len(self.body_names)) - self.qpos: torch.Tensor | None = None - self.qvel: torch.Tensor | None = None - self.joint_pos = torch.empty(joint_shape, dtype=torch.float32, device=self.device) - self.joint_vel = torch.empty_like(self.joint_pos) - self.linvel = torch.empty((self.num_envs, 3), dtype=torch.float32, device=self.device) - self.gyro = torch.empty_like(self.linvel) - self.robot_body_pos = torch.empty((*body_shape, 3), device=self.device) - self.robot_body_quat = torch.empty((*body_shape, 4), device=self.device) - self.robot_body_lin_vel = torch.empty_like(self.robot_body_pos) - self.robot_body_ang_vel = torch.empty_like(self.robot_body_pos) - self._host_bridge_plan: HostBridgeTransferPlan | None = None - self.last_backend_result: dict | None = None - if self._execution is TensorExecution.HOST_BRIDGE: - if not capabilities.packed_host_bridge: - raise RuntimeError( - "Tensor state store requires packed I/O for host-bridge physics backends" - ) - sensor_names = ( - "pelvis_local_linvel", - "torso_gyro", - *( - f"{prefix}_{name}" - for prefix in ( - "track_pos_w", - "track_quat_w", - "track_linvel_w", - "track_angvel_w", - ) - for name in self.body_names - ), - ) - self._host_bridge_plan = self.backend.bind_host_bridge_io( - TensorIOSpec( - state_fields=("qpos", "qvel"), - sensor_names=sensor_names, - device=self.device, - ) - ) - self._device_state_views: dict[str, torch.Tensor] | None = None - self._device_sensor_views: dict[str, object] | None = None - self._device_linvel_view: torch.Tensor | None = None - self._device_gyro_view: torch.Tensor | None = None - - def _require_qviews(self) -> tuple[torch.Tensor, torch.Tensor]: - if self.qpos is None or self.qvel is None: - raise RuntimeError("tensor state store has not performed a full read") - return self.qpos, self.qvel - - def qviews(self) -> tuple[torch.Tensor, torch.Tensor]: - """Return the current backend qpos/qvel views after a full read.""" - return self._validate_qviews() - - def _validate_rows(self, rows: torch.Tensor | None) -> torch.Tensor | None: - if rows is None: - return None - if rows.ndim != 1 or rows.device != self.device or rows.dtype != torch.int64: - raise ValueError("tensor state rows must be a one-dimensional int64 device tensor") - if rows.numel() == 0: - return rows - minimum_row, maximum_row = ( - int(value) for value in torch.stack((rows.min(), rows.max())).tolist() - ) - if minimum_row < 0 or maximum_row >= self.num_envs: - raise IndexError( - "tensor state rows are outside the environment range " - f"[0, {self.num_envs}); got [{minimum_row}, {maximum_row}]" - ) - return rows - - def _validate_qviews(self) -> tuple[torch.Tensor, torch.Tensor]: - qpos, qvel = self._require_qviews() - expected_qvel = (self.num_envs, qpos.shape[1] - 1) - if qpos.shape != (self.num_envs, qvel.shape[1] + 1): - raise RuntimeError( - f"backend qpos/qvel shapes are inconsistent: {tuple(qpos.shape)} vs {tuple(qvel.shape)}" - ) - if expected_qvel != tuple(qvel.shape): - raise RuntimeError( - f"backend qvel shape is {tuple(qvel.shape)}, expected {expected_qvel}" - ) - if qpos.device != self.device or qvel.device != self.device: - raise RuntimeError("backend qpos/qvel views live on the wrong device") - return qpos, qvel - - def _read_device_resident(self, rows: torch.Tensor | None) -> None: - state_views = self._device_state_views - sensor_views = self._device_sensor_views - if state_views is None or sensor_views is None: - requested_views = self.backend.get_state_views(("qpos", "qvel"), device=self.device) - qpos = requested_views["qpos"] - qvel = requested_views["qvel"] - if not isinstance(qpos, torch.Tensor) or not isinstance(qvel, torch.Tensor): - raise TypeError("device-resident state views did not return tensors") - state_views = {"qpos": qpos, "qvel": qvel} - sensor_views = {} - linvel_view = self.backend.get_sensor_view("pelvis_local_linvel", device=self.device) - gyro_view = self.backend.get_sensor_view("torso_gyro", device=self.device) - if not isinstance(linvel_view, torch.Tensor) or not isinstance(gyro_view, torch.Tensor): - raise TypeError("device-resident scalar sensor views did not return tensors") - sensor_views["linvel"] = linvel_view - sensor_views["gyro"] = gyro_view - for prefix in ("track_pos_w", "track_quat_w", "track_linvel_w", "track_angvel_w"): - sensor_views[prefix] = tuple( - self.backend.get_sensor_view(f"{prefix}_{name}", device=self.device) - for name in self.body_names - ) - self._device_state_views = state_views - self._device_sensor_views = sensor_views - self._device_linvel_view = linvel_view - self._device_gyro_view = gyro_view - self.linvel = linvel_view - self.gyro = gyro_view - else: - # Named sensor views are not guaranteed to be stable snapshots on - # every DEVICE_RESIDENT adapter. Crossing the public sensor-read - # boundary here is what refreshes adapter-owned projections before - # task code consumes them. - linvel_view = self.backend.get_sensor_view("pelvis_local_linvel", device=self.device) - gyro_view = self.backend.get_sensor_view("torso_gyro", device=self.device) - self._device_linvel_view = linvel_view - self._device_gyro_view = gyro_view - self.linvel = linvel_view - self.gyro = gyro_view - # One tracked-sensor read refreshes all injected frame sensors. - self.backend.get_sensor_view(f"track_pos_w_{self.body_names[0]}", device=self.device) - if rows is not None and ( - self._device_linvel_view is None or self._device_gyro_view is None - ): - raise RuntimeError("scalar sensor views were not negotiated before row read") - - self.qpos = state_views["qpos"] - self.qvel = state_views["qvel"] - self._validate_qviews() - self.joint_pos = self.qpos[:, self.joint_qpos_ids] - self.joint_vel = self.qvel[:, self.joint_qvel_ids] - destinations = ( - self.robot_body_pos, - self.robot_body_quat, - self.robot_body_lin_vel, - self.robot_body_ang_vel, - ) - prefixes = ("track_pos_w", "track_quat_w", "track_linvel_w", "track_angvel_w") - for destination, prefix in zip(destinations, prefixes, strict=True): - views = sensor_views[prefix] - if not isinstance(views, tuple) or len(views) != len(self.body_names): - raise TypeError("device-resident body sensor views did not match the body layout") - if rows is None: - torch.stack(views, dim=1, out=destination) - else: - selected = torch.stack(tuple(view.index_select(0, rows) for view in views), dim=1) - destination.index_copy_(0, rows, selected) - - def _read_host_bridge(self, rows: torch.Tensor | None) -> None: - assert self._host_bridge_plan is not None - values = ( - self._host_bridge_plan.read_state_sensors() - if rows is None - else self._host_bridge_plan.read_selected_state_sensors() - ) - self.qpos = values["qpos"] - self.qvel = values["qvel"] - qpos, qvel = self._validate_qviews() - self.joint_pos = qpos[:, self.joint_qpos_ids] - self.joint_vel = qvel[:, self.joint_qvel_ids] - self.linvel = values["pelvis_local_linvel"] - self.gyro = values["torso_gyro"] - destinations = ( - self.robot_body_pos, - self.robot_body_quat, - self.robot_body_lin_vel, - self.robot_body_ang_vel, - ) - prefixes = ("track_pos_w", "track_quat_w", "track_linvel_w", "track_angvel_w") - for destination, prefix in zip(destinations, prefixes, strict=True): - torch.stack( - tuple(values[f"{prefix}_{name}"] for name in self.body_names), - dim=1, - out=destination, - ) - self.last_backend_result = {"timing": dict(self._host_bridge_plan.last_timing)} - - def read(self, rows: torch.Tensor | None = None) -> None: - selected_rows = self._validate_rows(rows) - if selected_rows is not None and selected_rows.numel() == 0: - return - if self._execution is TensorExecution.DEVICE_RESIDENT: - self._read_device_resident(selected_rows) - elif self._execution is TensorExecution.HOST_BRIDGE: - self._read_host_bridge(selected_rows) - else: # Guarded in the constructor; retained for exhaustive dispatch. - raise RuntimeError("Tensor state store received an unsupported tensor execution") - - def step_tensor(self, ctrl: torch.Tensor, nsteps: int) -> dict | None: - """Step through the negotiated packed plan when one is available.""" - if self._host_bridge_plan is not None: - self._host_bridge_plan.write_control(ctrl) - return cast(dict | None, self._host_bridge_plan.step(nsteps)) - return cast(dict | None, self.backend.step_tensor(ctrl, nsteps=nsteps)) - - def refresh_named_sensors(self) -> None: - """Cross the backend's named-sensor projection boundary. - - DEVICE_RESIDENT adapters may recompute derived projections when a named - sensor view is requested. Unlike :meth:`read`, this method performs no - row validation, state-view negotiation, or task-buffer copy. - """ - if self._execution is not TensorExecution.DEVICE_RESIDENT: - raise RuntimeError( - "named-sensor refresh requires DEVICE_RESIDENT tensor execution; " - f"received {self._execution}" - ) - self.backend.get_sensor_view("pelvis_local_linvel", device=self.device) - self.backend.get_sensor_view("torso_gyro", device=self.device) - self.backend.get_sensor_view(f"track_pos_w_{self.body_names[0]}", device=self.device) - - def apply_reset( - self, reset_mask: torch.Tensor, qpos: torch.Tensor, qvel: torch.Tensor - ) -> dict | None: - """Apply a fixed-width reset through the public mask boundary.""" - if ( - reset_mask.shape != (self.num_envs,) - or reset_mask.dtype != torch.bool - or reset_mask.device != self.device - ): - raise ValueError("tensor state reset mask must be full-width bool on the store device") - if not bool(reset_mask.any()): - return None - if self._execution is not TensorExecution.DEVICE_RESIDENT: - raise NotImplementedError( - "tensor state reset requires DEVICE_RESIDENT tensor execution; " - f"received {self._execution}" - ) - capabilities = self.backend.get_tensor_capabilities() - if not capabilities.selected_reset or not capabilities.mask_selected_reset: - raise NotImplementedError( - "tensor state reset requires declared selected_reset and " - "mask_selected_reset capabilities" - ) - result = cast(dict | None, self.backend.set_state_tensor_mask(reset_mask, qpos, qvel)) - self.last_backend_result = result - return result - - def validate_finite(self) -> None: - qpos, qvel = self._require_qviews() - values = ( - qpos, - qvel, - self.joint_pos, - self.joint_vel, - self.linvel, - self.gyro, - self.robot_body_pos, - self.robot_body_quat, - self.robot_body_lin_vel, - self.robot_body_ang_vel, - ) - if not bool(torch.isfinite(values[0]).all()): - raise ValueError("tensor robot state contains NaN or Inf") - for value in values[1:]: - if not bool(torch.isfinite(value).all()): - raise ValueError("tensor robot state contains NaN or Inf") - - -__all__ = ["DeviceStateStore"] diff --git a/src/unilab/training/__init__.py b/src/unilab/training/__init__.py index 7f0b30f14..c0e9a264b 100644 --- a/src/unilab/training/__init__.py +++ b/src/unilab/training/__init__.py @@ -13,7 +13,6 @@ from unilab.training.common import ( assert_offpolicy_task_choice_matches_algo, ensure_registries, - get_hydra_runtime_choice, setup_logger, ) from unilab.training.experiment import ExperimentTracker @@ -52,7 +51,6 @@ "create_env", "ensure_registries", "format_play_checkpoint_error", - "get_hydra_runtime_choice", "get_latest_checkpoint", "get_latest_run", "get_log_root", diff --git a/src/unilab/training/common.py b/src/unilab/training/common.py index 11226166b..abeeb7ff3 100644 --- a/src/unilab/training/common.py +++ b/src/unilab/training/common.py @@ -5,7 +5,6 @@ import logging from pathlib import Path -from hydra.core.hydra_config import HydraConfig from omegaconf import DictConfig, OmegaConf from unilab.base.registry import ensure_registries as _ensure_registries @@ -16,22 +15,6 @@ def ensure_registries() -> None: _ensure_registries() -def get_hydra_runtime_choice(cfg: DictConfig, group: str) -> str | None: - """Return a selected Hydra config-group choice when runtime metadata is available.""" - cfg_choice = OmegaConf.select(cfg, f"hydra.runtime.choices.{group}") - if cfg_choice is not None: - return str(cfg_choice) - - if not HydraConfig.initialized(): - return None - - try: - runtime_choice = HydraConfig.get().runtime.choices.get(group) - except (AttributeError, KeyError): - return None - return str(runtime_choice) if runtime_choice is not None else None - - def assert_offpolicy_task_choice_matches_algo( cfg: DictConfig, *, diff --git a/src/unilab/training/cuda_process_sharing.py b/src/unilab/training/cuda_process_sharing.py index da9510813..e6484ef5b 100644 --- a/src/unilab/training/cuda_process_sharing.py +++ b/src/unilab/training/cuda_process_sharing.py @@ -538,19 +538,9 @@ def probe_cuda_process_sharing( ) -def apply_cuda_process_sharing_manifest( - runtime_manifest: MutableMapping[str, Any], - evidence: CudaProcessSharingEvidence, -) -> None: - """Record process-sharing evidence in a producer-owned manifest mapping.""" - - runtime_manifest["cuda_process_sharing"] = evidence.to_dict() - - __all__ = [ "CudaProcessSharingEvidence", "SUPPORTED_CUDA_PROCESS_SHARING_BACKENDS", - "apply_cuda_process_sharing_manifest", "canonicalize_gpu_uuid", "probe_cuda_process_sharing", "resolve_mps_visibility_entries", diff --git a/src/unilab/training/run.py b/src/unilab/training/run.py index 64b1e2a27..3c3ae3016 100644 --- a/src/unilab/training/run.py +++ b/src/unilab/training/run.py @@ -125,6 +125,26 @@ def reject_removed_validation_keys(cfg: DictConfig) -> None: ) +def reject_removed_ppo_resume_keys(cfg: DictConfig) -> None: + """Fail closed on the PPO-owner resume keys removed from the public config surface. + + PPO resume is owned by ``algo.load_run`` + ``algo.checkpoint`` (resolved via + ``resolve_configured_checkpoint_path``). The off-policy owners still consume + ``algo.resume`` / ``algo.resume_path``, so the rejection is scoped to the PPO + entrypoint instead of :func:`reject_removed_validation_keys`. + """ + if OmegaConf.select(cfg, "algo.resume", default=None) is not None: + raise ValueError( + "algo.resume was removed from the PPO owner config: PPO resume is opt-in via " + "algo.load_run (with algo.checkpoint); the off-policy owners still own algo.resume" + ) + if OmegaConf.select(cfg, "algo.resume_path", default=None) is not None: + raise ValueError( + "algo.resume_path was removed from the PPO owner config: PPO resume is opt-in via " + "algo.load_run (with algo.checkpoint); the off-policy owners still own algo.resume_path" + ) + + def apply_env_nan_guard(env: Any, training_cfg: Any) -> None: """Attach a ``NanGuard`` to ``env`` when diagnostics are enabled.""" nan_guard_cfg = resolve_nan_guard_cfg(training_cfg) diff --git a/src/unilab/visualization/__init__.py b/src/unilab/visualization/__init__.py index 3de32262d..1379d3871 100644 --- a/src/unilab/visualization/__init__.py +++ b/src/unilab/visualization/__init__.py @@ -1,6 +1,6 @@ """Visualization and playback helpers.""" -from unilab.visualization.playback import camera_cfg_from_training, render_play_mode +from unilab.visualization.playback import camera_cfg_from_training from unilab.visualization.playback_session import SnapshotPlaybackSession -__all__ = ["SnapshotPlaybackSession", "camera_cfg_from_training", "render_play_mode"] +__all__ = ["SnapshotPlaybackSession", "camera_cfg_from_training"] diff --git a/src/unilab/visualization/interactive_playback.py b/src/unilab/visualization/interactive_playback.py index f7f92f9a3..92d5497d9 100644 --- a/src/unilab/visualization/interactive_playback.py +++ b/src/unilab/visualization/interactive_playback.py @@ -423,14 +423,13 @@ def _scene_visual_materializer() -> Any: return config_adapter.materialize_scene_visual_override -def build_play_backend_adapter(cfg: Any, *, root_dir: str | Path, algo_name: str = "ppo") -> Any: +def build_play_backend_adapter(cfg: Any, *, root_dir: str | Path) -> Any: """Build the EnvConfigAdapter used by play entrypoints to derive env cfg overrides.""" from unilab.base.config_adapter import EnvConfigAdapter return EnvConfigAdapter( cfg, root_dir=root_dir, - algo_name=algo_name, scene_materializer=_scene_visual_materializer(), ) @@ -745,15 +744,6 @@ def default_device(torch_module, preferred: str | None = None) -> str: return "cpu" -def extract_reset_obs(reset_result): - """Extract obs_dict from env.reset(...) using the current (obs_dict, info_dict) contract.""" - if isinstance(reset_result, tuple): - if len(reset_result) == 2: - obs_out, _ = reset_result - return obs_out - raise ValueError(f"Unexpected env.reset return format: {type(reset_result)!r}") - - def resolve_play_obs_dims(obs_groups_spec: dict[str, int]) -> tuple[int, int]: from unilab.base.contracts.observations import get_obs_dims @@ -940,7 +930,7 @@ def build_offpolicy_env_cfg_override( assert_offpolicy_task_choice_matches_algo(cfg, algo_name=algo_name) return cast( dict[str, Any] | None, - EnvConfigAdapter(cfg, root_dir=root_dir, algo_name=algo_name).build_task_env_cfg_override(), + EnvConfigAdapter(cfg, root_dir=root_dir).build_task_env_cfg_override(), ) @@ -962,7 +952,7 @@ def build_offpolicy_play_env_cfg_override( assert_offpolicy_task_choice_matches_algo(cfg, algo_name=algo_name) return cast( dict[str, Any] | None, - EnvConfigAdapter(cfg, root_dir=root_dir, algo_name=algo_name).build_play_env_cfg_override(), + EnvConfigAdapter(cfg, root_dir=root_dir).build_play_env_cfg_override(), ) diff --git a/src/unilab/visualization/playback.py b/src/unilab/visualization/playback.py index 1142b667e..d553345e6 100644 --- a/src/unilab/visualization/playback.py +++ b/src/unilab/visualization/playback.py @@ -2,14 +2,9 @@ from __future__ import annotations -from pathlib import Path -from typing import Any, Callable, TypeVar, cast +from typing import Any -import numpy as np -import torch -from unisim.backend.base import CameraCfg, DebugOverlayGetter - -ObsT = TypeVar("ObsT") +from unisim.backend.base import CameraCfg def camera_cfg_from_training(training_cfg: Any) -> CameraCfg: @@ -33,72 +28,6 @@ def camera_cfg_from_training(training_cfg: Any) -> CameraCfg: ) -def render_play_mode( - env, - *, - initialize: Callable[[], ObsT], - step: Callable[[ObsT], ObsT], - num_steps: int | None, - output_video: str | Path | None = None, - render_spacing: float | None = None, - render_offset_mode: str | None = None, - headless: bool | None = None, - record_video: bool | None = None, - frame_state_getter: Callable[[], np.ndarray] | None = None, - camera_kwargs: CameraCfg | dict[str, Any] | None = None, - debug_overlay_getter: DebugOverlayGetter | None = None, - on_frame: Callable[[int, np.ndarray], np.ndarray | None] | None = None, -) -> str | None: - """Run playback through the env/backend playback contract. - - Backend selection belongs to ``env.run_playback()`` and the concrete - backend implementations. - """ - return cast( - str | None, - env.run_playback( - initialize=initialize, - step=step, - num_steps=num_steps, - output_video=output_video, - render_spacing=render_spacing, - render_offset_mode=render_offset_mode, - headless=headless, - record_video=record_video, - frame_state_getter=frame_state_getter, - camera_kwargs=camera_kwargs, - debug_overlay_getter=debug_overlay_getter, - on_frame=on_frame, - ), - ) - - -def run_native_viewer_play_loop( - env, - *, - initialize: Callable[[], ObsT], - step: Callable[[ObsT], ObsT], - num_steps: int | None = None, - render_spacing: float | None = None, - render_offset_mode: str | None = None, -) -> None: - """Run the backend-native viewer loop under ``torch.inference_mode()``. - - Shared by the training entrypoints' native-viewer playback paths; callers - own the policy wiring through the ``initialize``/``step`` callbacks. - """ - with torch.inference_mode(): - env.run_playback( - render_spacing=render_spacing, - render_offset_mode=render_offset_mode, - num_steps=num_steps, - initialize=initialize, - step=step, - ) - - __all__ = [ "camera_cfg_from_training", - "render_play_mode", - "run_native_viewer_play_loop", ] diff --git a/tests/base/contracts/test_env.py b/tests/base/contracts/test_env.py index 8ea3860c2..dcd7382e8 100644 --- a/tests/base/contracts/test_env.py +++ b/tests/base/contracts/test_env.py @@ -2,7 +2,6 @@ from __future__ import annotations -import numpy as np import pytest import torch @@ -31,9 +30,7 @@ def test_get_algo_capabilities_default_when_env_does_not_provide(): caps = get_algo_capabilities(env) assert isinstance(caps, EnvAlgoCapabilitiesProtocol) - assert caps.action_low is None - assert caps.action_high is None - assert caps.joint_names is None + assert caps.reward_component_names is None def test_get_produces_completion_receipts_defaults_to_fail_closed(): @@ -67,30 +64,24 @@ class _BadEnv: def test_get_algo_capabilities_returns_provided_values(): provided = EnvAlgoCapabilities( - action_low=np.array([-1.0, -2.0, -3.0], dtype=np.float32), - joint_names=("hip", "knee", "ankle"), + reward_component_names=("track",), ) env = _make_env(algo_capabilities=provided) assert isinstance(env, SupportsAlgoCapabilitiesProtocol) caps = get_algo_capabilities(env) assert caps is provided - np.testing.assert_array_equal(caps.action_low, provided.action_low) - assert caps.action_high is None - assert caps.joint_names == ("hip", "knee", "ankle") + assert caps.reward_component_names == ("track",) def test_runtime_checkable_isinstance_semantics(): assert isinstance(EnvAlgoCapabilities(), EnvAlgoCapabilitiesProtocol) class _Full: - action_low = np.zeros((2,), dtype=np.float32) - action_high = np.ones((2,), dtype=np.float32) - joint_names = ("a", "b") reward_component_names = ("alive",) class _MissingField: - action_low = np.zeros((2,), dtype=np.float32) + pass # runtime_checkable protocols check attribute presence only. assert isinstance(_Full(), EnvAlgoCapabilitiesProtocol) @@ -102,7 +93,7 @@ class _MissingField: def test_default_carrier_is_frozen(): caps = EnvAlgoCapabilities() try: - caps.action_low = np.zeros((1,), dtype=np.float32) # type: ignore[misc] + caps.reward_component_names = ("track",) # type: ignore[misc] except AttributeError: pass else: # pragma: no cover diff --git a/tests/base/test_mjwarp_backend.py b/tests/base/test_mjwarp_backend.py index 11e098f00..dc08a6808 100644 --- a/tests/base/test_mjwarp_backend.py +++ b/tests/base/test_mjwarp_backend.py @@ -225,7 +225,6 @@ def test_g1_walk_flat_owner_one_step( env_cfg_override = EnvConfigAdapter( cfg, root_dir=REPO_ROOT, - algo_name=algo_name, ).build_task_env_cfg_override() registry.ensure_registries() env = registry.make( @@ -258,7 +257,6 @@ def test_g1_walk_flat_owner_eager_capture_warmup_and_replay_share_semantics() -> env_cfg_override = EnvConfigAdapter( cfg, root_dir=REPO_ROOT, - algo_name="ppo", ).build_task_env_cfg_override() registry.ensure_registries() diff --git a/tests/base/test_registry.py b/tests/base/test_registry.py index d8d30d573..2bb765a4e 100644 --- a/tests/base/test_registry.py +++ b/tests/base/test_registry.py @@ -217,21 +217,6 @@ def test_duplicate_env_config_raises(): registry_mod.register_env_config(_TEST_ENV_A, _TestCfgA) -def test_find_available_sim_backend(): - backend = registry_mod.find_available_sim_backend(_TEST_ENV_A) - assert backend == "mujoco" - - -def test_find_available_sim_backend_prefers_explicit_default_order(): - backend = registry_mod.find_available_sim_backend(_TEST_ENV_C) - assert backend == "mujoco" - - -def test_find_available_sim_backend_missing_raises(): - with pytest.raises(ValueError): - registry_mod.find_available_sim_backend("__nonexistent_env__") - - def test_make_returns_correct_type(): env = registry_mod.make(_TEST_ENV_A, sim_backend="mujoco") assert isinstance(env, _TestEnvA) @@ -272,7 +257,7 @@ def test_register_env_accepts_explicit_isaac_backend(backend): registry_mod.register_env(_name, _TestEnvA, "mujoco") assert registry_mod.register_env(_name, _TestEnvA, backend) is _TestEnvA - assert registry_mod.find_available_sim_backend(_name) == "mujoco" + assert registry_mod._envs[_name].available_sim_backend() == "mujoco" def test_default_backend_order_is_tensor_manager_scope(): @@ -314,13 +299,6 @@ def test_register_env_rejects_non_callable_factory(): registry_mod.register_env(_name, object(), "mujoco") # type: ignore[arg-type] -def test_find_available_sim_backend_no_env_factory_raises(): - """find_available_sim_backend() raises when config exists but no env factory is registered.""" - # _TEST_ENV_B has config but no env factory (registered above without env) - with pytest.raises(ValueError, match="does not support any simulation backend"): - registry_mod.find_available_sim_backend(_TEST_ENV_B) - - # --------------------------------------------------------------------------- # make() validation branches # --------------------------------------------------------------------------- diff --git a/tests/base/test_torch_env.py b/tests/base/test_torch_env.py index 307edb5fa..0979e2cf8 100644 --- a/tests/base/test_torch_env.py +++ b/tests/base/test_torch_env.py @@ -1004,7 +1004,7 @@ def poll_finite_validation(self) -> bool: return False env.observation_manager = _NonfatalVerdict() # type: ignore[attr-defined] - env.record_finite_validation(torch.tensor([float("nan")]), "base") + env.record_finite_validation(torch.tensor([float("nan")])) with pytest.raises(ValueError, match="deferred finite validation"): env.poll_finite_validation(force=True) diff --git a/tests/envs/locomotion/g1/test_g1_owner_contract.py b/tests/envs/locomotion/g1/test_g1_owner_contract.py index 6a6830507..35bf38480 100644 --- a/tests/envs/locomotion/g1/test_g1_owner_contract.py +++ b/tests/envs/locomotion/g1/test_g1_owner_contract.py @@ -1037,7 +1037,7 @@ def _genesis_runtime_available() -> bool: assert hydra_cfg.training.play_render_mode == "auto" env_override = EnvConfigAdapter( - hydra_cfg, root_dir=ROOT, algo_name=CONFIG_GROUP + hydra_cfg, root_dir=ROOT ).build_task_env_cfg_override() env_cfg = registry.materialize_env_config("G1WalkFlat") assert isinstance(env_cfg, ManagerBasedRlEnvCfg) diff --git a/tests/envs/mdp/test_terminations.py b/tests/envs/mdp/test_terminations.py index 16e00fffd..9673dd74b 100644 --- a/tests/envs/mdp/test_terminations.py +++ b/tests/envs/mdp/test_terminations.py @@ -200,11 +200,9 @@ def test_nan_detection_integrates_with_termination_manager() -> None: def test_state_check_defers_to_the_env_finite_verdict() -> None: """Deferred mode records the verdict device-side instead of raising.""" env = _env() - recorded: list[tuple[torch.Tensor, str]] = [] + recorded: list[torch.Tensor] = [] setattr(env, "defer_finite_validation", True) - setattr( - env, "record_finite_validation", lambda value, label="": recorded.append((value, label)) - ) + setattr(env, "record_finite_validation", lambda value: recorded.append(value)) entity = cast(Any, env.scene["robot"]) entity.root_pos[:] = np.nan @@ -213,8 +211,7 @@ def test_state_check_defers_to_the_env_finite_verdict() -> None: mdp.root_height_below_minimum(env, minimum_height=0.5) assert len(recorded) == 1 - value, label = recorded[0] - assert label == "termination['root_height_below_minimum']" + value = recorded[0] assert not bool(torch.isfinite(value).all()) diff --git a/tests/envs/mdp/test_uniform_velocity_command.py b/tests/envs/mdp/test_uniform_velocity_command.py index 8198d8543..8e946b3ea 100644 --- a/tests/envs/mdp/test_uniform_velocity_command.py +++ b/tests/envs/mdp/test_uniform_velocity_command.py @@ -315,7 +315,6 @@ def test_heading_world_forward_and_standing_modes() -> None: ), ({"heading_control_stiffness": float("nan")}, ValueError, "must be finite"), ({"resampling_time_range": (0.0, 0.0)}, ValueError, "must be positive"), - ({"init_velocity_prob": 0.1}, NotImplementedError, "root velocity write"), ], ) def test_invalid_or_unsupported_config_fails_at_construction( diff --git a/tests/envs/test_env_configs.py b/tests/envs/test_env_configs.py index 639953a96..e779f662b 100644 --- a/tests/envs/test_env_configs.py +++ b/tests/envs/test_env_configs.py @@ -77,9 +77,7 @@ def _g1_manager_override( config_dir=str(repo_root / "src" / "unilab" / "conf" / config_group), version_base="1.3" ): cfg = compose("config", overrides=[f"task={task}/{backend}"]) - return EnvConfigAdapter( - cfg, root_dir=repo_root, algo_name=config_group - ).build_task_env_cfg_override() + return EnvConfigAdapter(cfg, root_dir=repo_root).build_task_env_cfg_override() def _motion_manager_override( @@ -103,7 +101,6 @@ def _motion_manager_override( return str(cfg.training.task_name), EnvConfigAdapter( cfg, root_dir=repo_root, - algo_name=config_root, ).build_task_env_cfg_override() @@ -485,7 +482,7 @@ def test_flashsac_g1_motion_mujoco_tensor_command_roll_out() -> None: ): owner = compose("config", overrides=["task=g1_motion_tracking/mujoco"]) override = EnvConfigAdapter( - owner, root_dir=root, algo_name="flashsac" + owner, root_dir=root ).build_task_env_cfg_override() env = registry.make( "G1MotionTracking", diff --git a/tests/envs/test_manager_based_rl_env.py b/tests/envs/test_manager_based_rl_env.py index 583a2886d..9f549fd74 100644 --- a/tests/envs/test_manager_based_rl_env.py +++ b/tests/envs/test_manager_based_rl_env.py @@ -1389,9 +1389,6 @@ def test_step_publishes_fixed_width_reward_components_for_tensor_collectors() -> state = env.step(torch.tensor([[0.25], [0.75]], dtype=torch.float32)) assert env.algo_capabilities.reward_component_names == ("track",) - assert env.algo_capabilities.action_low is None - assert env.algo_capabilities.action_high is None - assert env.algo_capabilities.joint_names is None assert "reward_components" in state.info assert "reward/track" not in state.info["log"] torch.testing.assert_close( diff --git a/tests/envs/test_observation_partial_reset.py b/tests/envs/test_observation_partial_reset.py index d08a86ff8..c3a3bd5a1 100644 --- a/tests/envs/test_observation_partial_reset.py +++ b/tests/envs/test_observation_partial_reset.py @@ -38,9 +38,7 @@ def _make_env(config_root: str, task: str, backend: str, identity: str, num_envs owner = compose("config", overrides=[f"task={task}/{backend}"]) cfg = registry.materialize_env_config(identity) assert isinstance(cfg, ManagerBasedRlEnvCfg) - override = EnvConfigAdapter( - owner, root_dir=_ROOT, algo_name=config_root - ).build_task_env_cfg_override() + override = EnvConfigAdapter(owner, root_dir=_ROOT).build_task_env_cfg_override() apply_cfg_overrides(cfg, override) return registry.make( identity, num_envs=num_envs, sim_backend=backend, env_cfg_override=override diff --git a/tests/managers/test_core_managers.py b/tests/managers/test_core_managers.py index f57c0fcf5..5d0a236ee 100644 --- a/tests/managers/test_core_managers.py +++ b/tests/managers/test_core_managers.py @@ -264,7 +264,6 @@ def test_reward_dt_scaling_reset_and_config_immutability(fake_env: FakeEnv) -> N assert isinstance(reward, torch.Tensor) assert reward.device.type == "cpu" torch.testing.assert_close(reward, fake_env.value * 0.5) - assert manager.get_active_iterable_terms(2) == [("stateful", [4.0])] reset_ids = torch.tensor([1, 2], dtype=torch.int64) extras = manager.reset(reset_ids) assert extras == {} @@ -543,8 +542,8 @@ def test_termination_aggregation_recomputes_correct_values(fake_env: FakeEnv) -> first = manager.compute() torch.testing.assert_close(first, timeout | failure) - torch.testing.assert_close(manager.get_term("timeout"), timeout) - torch.testing.assert_close(manager.get_term("failure"), failure) + torch.testing.assert_close(manager.time_outs, timeout) + torch.testing.assert_close(manager.terminated, failure) # The returned dones are an internal view; the observable contract is that # the next compute reflects the new inputs exactly. @@ -552,9 +551,8 @@ def test_termination_aggregation_recomputes_correct_values(fake_env: FakeEnv) -> failure[2] = True second = manager.compute() torch.testing.assert_close(second, timeout | failure) - torch.testing.assert_close(manager.get_term("failure"), failure) - torch.testing.assert_close(manager.time_outs, timeout) torch.testing.assert_close(manager.terminated, failure) + torch.testing.assert_close(manager.time_outs, timeout) def test_transient_tensor_termination_opt_in_preserves_manager_buffers( @@ -562,13 +560,15 @@ def test_transient_tensor_termination_opt_in_preserves_manager_buffers( ) -> None: class TransientFailure: returns_transient_tensor = True + last: torch.Tensor | None = None def __init__(self, cfg: TerminationTermCfg, env: FakeEnv): del cfg, env def __call__(self, env: FakeEnv) -> torch.Tensor: del env - return torch.tensor([False, True, False, True]) + self.last = torch.tensor([False, True, False, True]) + return self.last manager = TerminationManager( {"failure": TerminationTermCfg(func=TransientFailure)}, @@ -576,11 +576,13 @@ def __call__(self, env: FakeEnv) -> torch.Tensor: ) manager.compute() - original = manager.get_term("failure").clone() + original = manager.terminated.clone() # This marker is an ownership declaration by the term: the term promises # not to mutate this transient expression after returning it. Manager-owned # aggregate/per-term buffers therefore receive a copy during aggregation. - manager.get_term("failure").logical_not_() + term = manager.get_term_cfg("failure").func + assert term.last is not None + term.last.logical_not_() torch.testing.assert_close(manager.terminated, original) @@ -605,16 +607,14 @@ def __call__(self, env: FakeEnv) -> torch.Tensor: manager.compute() assert failure.output is not None - assert manager.get_term("failure") is not failure.output + assert manager.terminated is not failure.output failure.output.logical_not_() # A non-transient term owns the returned full-width carrier. The manager # publishes it into persistent aggregation buffers and remains immune to # later owner mutation. - torch.testing.assert_close( - manager._term_dones["failure"], torch.tensor([False, True, False, True]) - ) + torch.testing.assert_close(manager.terminated, torch.tensor([False, True, False, True])) def test_termination_aggregation_publishes_time_outs_through_owner_scratch( diff --git a/tests/managers/test_device_contracts.py b/tests/managers/test_device_contracts.py index f8c760ead..a822dcb84 100644 --- a/tests/managers/test_device_contracts.py +++ b/tests/managers/test_device_contracts.py @@ -29,7 +29,7 @@ TerminationManager, TerminationTermCfg, ) -from unilab.managers._noise import GaussianNoiseCfg, NoiseModelWithAdditiveBiasCfg +from unilab.managers._noise import NoiseModelWithAdditiveBiasCfg, UniformNoiseCfg from unilab.tasks.locomotion.common import manager_terms from .conftest import FakeEnv @@ -96,10 +96,10 @@ def test_observation_row_scoped_indexing_and_reset_on_cuda() -> None: env, ) manager.compute() - - terms = manager.get_active_iterable_terms(1) - assert terms[0][0] == "policy-obs" - assert terms[0][1] == pytest.approx([4.0, 1.5]) + policy = manager.compute()["policy"] + torch.testing.assert_close( + policy[1], torch.tensor([4.0, 1.5], dtype=policy.dtype, device=policy.device) + ) assert manager.reset(torch.tensor([0, 2], dtype=torch.int64, device=env.device)) == {} recomputed = manager.compute()["policy"] @@ -216,8 +216,8 @@ def test_observation_noise_model_bias_buffer_on_cuda() -> None: "state": ObservationTermCfg( func=lambda env: env.obs, noise=NoiseModelWithAdditiveBiasCfg( - noise_cfg=GaussianNoiseCfg(mean=0.0, std=0.1), - bias_noise_cfg=GaussianNoiseCfg(mean=0.0, std=0.1), + noise_cfg=UniformNoiseCfg(n_min=-0.2, n_max=0.2), + bias_noise_cfg=UniformNoiseCfg(n_min=-0.2, n_max=0.2), ), ), }, diff --git a/tests/managers/test_observation_buffers_noise.py b/tests/managers/test_observation_buffers_noise.py index 245c66151..3135912d5 100644 --- a/tests/managers/test_observation_buffers_noise.py +++ b/tests/managers/test_observation_buffers_noise.py @@ -10,11 +10,8 @@ from unilab.managers import ObservationGroupCfg, ObservationManager, ObservationTermCfg from unilab.managers._buffers import CircularBuffer, DelayBuffer from unilab.managers._noise import ( - ConstantNoiseCfg, - GaussianNoiseCfg, NoiseCfg, NoiseModelWithAdditiveBiasCfg, - SegmentwiseUniformNoiseCfg, UniformNoiseCfg, ) @@ -169,23 +166,9 @@ def test_noise_configs_use_supplied_generator() -> None: with pytest.raises(ValueError, match="env-owned"): uniform.apply(data) - gaussian = GaussianNoiseCfg(mean=0.0, std=0.1) - assert gaussian.apply(data, torch_rng=torch.Generator().manual_seed(2)).shape == data.shape - torch.testing.assert_close( - ConstantNoiseCfg(bias=2.0, operation="abs").apply(data), torch.full_like(data, 2.0) - ) - -@pytest.mark.parametrize( - "cfg", - [ - ConstantNoiseCfg(bias=2.0), - UniformNoiseCfg(n_min=-0.2, n_max=0.2), - SegmentwiseUniformNoiseCfg(ranges=((-0.2, 0.2),)), - GaussianNoiseCfg(std=0.1), - ], -) -def test_noise_configs_reject_numpy_carriers(cfg: NoiseCfg) -> None: +def test_noise_configs_reject_numpy_carriers() -> None: + cfg: NoiseCfg = UniformNoiseCfg(n_min=-0.2, n_max=0.2) generator = torch.Generator().manual_seed(7) with pytest.raises(TypeError, match="torch.Tensor"): @@ -214,36 +197,6 @@ def test_uniform_noise_inplace_matches_reference_expression(operation: str) -> N torch.testing.assert_close(data, torch.arange(24, dtype=torch.float32).reshape(8, 3)) -@pytest.mark.parametrize( - ("cfg", "expected"), - [ - ( - ConstantNoiseCfg(bias=(0.1, -0.2), operation="add"), - lambda data, noise: data + torch.tensor((0.1, -0.2)), - ), - ( - ConstantNoiseCfg(bias=2.0, operation="scale"), - lambda data, noise: data * 2.0, - ), - ( - ConstantNoiseCfg(bias=(0.3, -0.1), operation="abs"), - lambda data, noise: torch.tensor((0.3, -0.1)).expand_as(data), - ), - ], -) -def test_constant_tensor_noise_stays_on_device_without_rng( - cfg: ConstantNoiseCfg, expected, fake_env: FakeEnv -) -> None: - device = fake_env.device - data = torch.arange(8, dtype=torch.float32, device=device).reshape(4, 2) - result = cfg.apply(data) - - assert isinstance(result, torch.Tensor) - assert result.device == device - assert result.dtype == torch.float32 - torch.testing.assert_close(result, expected(data, None)) - - @pytest.mark.parametrize("operation", ["add", "scale", "abs"]) def test_uniform_tensor_noise_uses_manager_rng_stream_and_device(operation: str) -> None: device = torch.device("cpu") @@ -260,68 +213,12 @@ def test_uniform_tensor_noise_uses_manager_rng_stream_and_device(operation: str) torch.testing.assert_close(first, second) -@pytest.mark.parametrize("operation", ["add", "scale", "abs"]) -def test_segmentwise_tensor_noise_bounds_each_final_column(operation: str) -> None: - cfg = SegmentwiseUniformNoiseCfg( - ranges=((-0.1, 0.1), (-0.2, 0.2), (0.0, 0.0)), - operation=operation, - ) - data = torch.ones((8, 3), dtype=torch.float32) - generator = torch.Generator().manual_seed(1811) - tensor_result = cfg.apply(data, torch_rng=generator) - - assert tensor_result.shape == data.shape - if operation == "abs": - assert bool((tensor_result[:, 0] >= -0.1).all()) and bool((tensor_result[:, 0] < 0.1).all()) - assert bool((tensor_result[:, 1] >= -0.2).all()) and bool((tensor_result[:, 1] < 0.2).all()) - elif operation == "scale": - assert bool((tensor_result[:, 0] >= -0.1).all()) and bool((tensor_result[:, 0] < 0.1).all()) - assert bool((tensor_result[:, 1] >= -0.2).all()) and bool((tensor_result[:, 1] < 0.2).all()) - else: - assert bool((tensor_result[:, 0] >= 0.9).all()) and bool((tensor_result[:, 0] < 1.1).all()) - assert bool((tensor_result[:, 1] >= 0.8).all()) and bool((tensor_result[:, 1] < 1.2).all()) - if operation == "scale": - torch.testing.assert_close(tensor_result[:, 2], torch.zeros(8)) - elif operation == "abs": - torch.testing.assert_close(tensor_result[:, 2], torch.zeros(8)) - else: - torch.testing.assert_close(tensor_result[:, 2], torch.ones(8)) - - -def test_gaussian_tensor_noise_uses_manager_rng_stream_and_device() -> None: - data = torch.arange(12, dtype=torch.float32).reshape(4, 3) - cfg = GaussianNoiseCfg(mean=(0.1, -0.1, 0.0), std=(0.2, 0.3, 0.4)) - first_rng = torch.Generator().manual_seed(31) - second_rng = torch.Generator().manual_seed(31) - first = cfg.apply(data, torch_rng=first_rng) - second = cfg.apply(data, torch_rng=second_rng) - - assert isinstance(first, torch.Tensor) - torch.testing.assert_close(first, second) - - -def test_gaussian_noise_clamps_standard_normal_draw() -> None: - torch_cfg = GaussianNoiseCfg(std=0.1, clamp=3.0) - tensor_data = torch.full((128, 4), 1.0) - - tensor_result = torch_cfg.apply(tensor_data, torch_rng=torch.Generator().manual_seed(72)) - - assert isinstance(tensor_result, torch.Tensor) - assert float((tensor_result - tensor_data).abs().max()) <= 0.3 + 1e-8 - - -@pytest.mark.parametrize("clamp", [0.0, -3.0, float("inf"), True]) -def test_gaussian_noise_rejects_invalid_clamp(clamp) -> None: - with pytest.raises((TypeError, ValueError), match="clamp"): - GaussianNoiseCfg(std=0.1, clamp=clamp) - - def test_additive_bias_noise_supports_scalar_terms() -> None: from unilab.managers._noise import NoiseModelWithAdditiveBias cfg = NoiseModelWithAdditiveBiasCfg( - noise_cfg=ConstantNoiseCfg(bias=0.0), - bias_noise_cfg=ConstantNoiseCfg(bias=0.5), + noise_cfg=UniformNoiseCfg(n_min=-0.05, n_max=0.05), + bias_noise_cfg=UniformNoiseCfg(n_min=0.4, n_max=0.6), ) model = NoiseModelWithAdditiveBias( cfg, @@ -330,8 +227,9 @@ def test_additive_bias_noise_supports_scalar_terms() -> None: device=torch.device("cpu"), ) result = model(torch.ones(4, dtype=torch.float32)) - torch.testing.assert_close(result, torch.full((4,), 1.5)) + # data (1.0) + uniform noise [-0.05, 0.05] + per-episode bias [0.4, 0.6]. assert result.shape == (4,) + assert bool((result >= 1.35).all()) and bool((result <= 1.65).all()) def test_additive_bias_noise_model_uses_manager_torch_generator(fake_env: FakeEnv) -> None: @@ -339,7 +237,7 @@ def test_additive_bias_noise_model_uses_manager_torch_generator(fake_env: FakeEn device = fake_env.device cfg = NoiseModelWithAdditiveBiasCfg( - noise_cfg=GaussianNoiseCfg(std=0.1), + noise_cfg=UniformNoiseCfg(n_min=-0.2, n_max=0.2), bias_noise_cfg=UniformNoiseCfg(n_min=-0.2, n_max=0.2), ) data = torch.ones((4, 3), dtype=torch.float32, device=device) @@ -395,7 +293,7 @@ def test_observation_groups_pipeline_order_and_history(fake_env: FakeEnv) -> Non # re-clipped or re-scaled when a new frame arrives. torch.testing.assert_close(second[:, :2], expected_first) torch.testing.assert_close(second[:, 2:4], expected_second) - assert manager.get_active_iterable_terms(0)[0][0] == "policy-state" + assert "policy" in manager.group_obs_dim def test_concatenated_observations_remain_caller_owned_across_later_computes( @@ -620,7 +518,7 @@ def test_tensor_noise_stays_on_device_without_observation_host_detour( "biased": ObservationTermCfg( func=lambda env: source, noise=NoiseModelWithAdditiveBiasCfg( - noise_cfg=GaussianNoiseCfg(std=0.1), + noise_cfg=UniformNoiseCfg(n_min=-0.2, n_max=0.2), bias_noise_cfg=UniformNoiseCfg(n_min=-0.2, n_max=0.2), ), ), @@ -811,7 +709,7 @@ def test_observation_noise_model_delay_and_seed_reproducibility() -> None: "state": ObservationTermCfg( func=lambda env: env.obs, noise=NoiseModelWithAdditiveBiasCfg( - noise_cfg=GaussianNoiseCfg(std=0.1), + noise_cfg=UniformNoiseCfg(n_min=-0.2, n_max=0.2), bias_noise_cfg=UniformNoiseCfg(n_min=-0.2, n_max=0.2), ), ) diff --git a/tests/rl/logging/test_offpolicy_logger.py b/tests/rl/logging/test_offpolicy_logger.py index be3ab07a8..e7f9975df 100644 --- a/tests/rl/logging/test_offpolicy_logger.py +++ b/tests/rl/logging/test_offpolicy_logger.py @@ -8,10 +8,8 @@ import unilab.rl.logging.base as base_logger_module import unilab.rl.logging.offpolicy as offpolicy_logger_module -import unilab.rl.logging.onpolicy as onpolicy_logger_module from unilab.rl.logging.base import BaseTrainingLogger from unilab.rl.logging.offpolicy import OffPolicyLogger -from unilab.rl.logging.onpolicy import OnPolicyLogger def test_offpolicy_logger_only_forces_refresh_for_errors(monkeypatch) -> None: @@ -846,19 +844,6 @@ def test_offpolicy_final_iteration_logs_when_interval_is_not_divisible() -> None assert [event.step for event in writer.events] == [4, 8, 9] -def test_onpolicy_final_iteration_logs_when_interval_is_not_divisible() -> None: - logger = OnPolicyLogger( - log_backend="none", num_envs=1, num_steps=1, max_iterations=9, log_interval=4 - ) - writer = _BatchedWriter() - logger._tb_writer = writer - - for iteration in range(10): - logger.log_step(iteration=iteration, metrics={"Loss/surrogate": float(iteration)}) - - assert [event.step for event in writer.events] == [0, 4, 8, 9] - - def test_offpolicy_source_contract_fails_even_when_backend_write_is_skipped() -> None: logger = OffPolicyLogger(log_backend="none", max_iterations=10, log_interval=5) @@ -875,10 +860,6 @@ def test_offpolicy_source_contract_fails_even_when_backend_write_is_skipped() -> (lambda: OffPolicyLogger(log_backend="none"), "Train/mean_episode_length"), (lambda: OffPolicyLogger(log_backend="none"), "Episode/timeout_rate"), (lambda: OffPolicyLogger(log_backend="none"), "Perf/collection_time"), - ( - lambda: OnPolicyLogger(log_backend="none", num_envs=1, num_steps=1), - "Train/mean_episode_length", - ), ], ) def test_source_metrics_cannot_bypass_logger_owned_telemetry( @@ -890,15 +871,6 @@ def test_source_metrics_cannot_bypass_logger_owned_telemetry( logger.log_step(iteration=1, metrics={tag: 1.0}) -def test_onpolicy_source_contract_fails_even_when_backend_write_is_skipped() -> None: - logger = OnPolicyLogger(log_backend="none", max_iterations=10, log_interval=5) - - with pytest.raises(ValueError, match="unregistered canonical training metric"): - logger.log_step(iteration=1, metrics={"train/actor_loss": 1.0}) - with pytest.raises(ValueError, match="reserved reward component name"): - logger.log_step(iteration=1, reward_components={"mean": 1.0}) - - def test_offpolicy_backend_step_axis_prefers_collector_env_steps() -> None: logger = OffPolicyLogger(log_backend="none") writer = _BatchedWriter() @@ -1055,84 +1027,3 @@ def test_offpolicy_replay_ingress_diagnostics_use_canonical_backend_payload() -> assert backend_scalars["Train/replay_ingress_depth"] == pytest.approx(2.0) assert backend_scalars["Train/replay_ingress_backpressure_wait_ms"] == pytest.approx(250.0) assert backend_scalars["Train/replay_ingress_dropped_batches"] == pytest.approx(1.0) - - -def test_onpolicy_tensorboard_and_wandb_use_the_same_canonical_payload( - monkeypatch: pytest.MonkeyPatch, -) -> None: - logger = OnPolicyLogger(log_backend="none", num_envs=10, num_steps=3) - writer = _BatchedWriter() - logger._tb_writer = writer - logger._wandb_run = object() - - wandb_calls: list[dict[str, Any]] = [] - - class _FakeWandb: - @staticmethod - def log(payload: dict[str, Any], *, step: int) -> None: - wandb_calls.append({"payload": payload, "step": step}) - - monkeypatch.setattr(onpolicy_logger_module, "_load_wandb", lambda: _FakeWandb) - - logger.log_step( - iteration=4, - metrics={"Loss/surrogate": 2.0}, - return_mean_ep100=2.5, - reward_components={"alive": 0.5}, - collect_time=0.1, - train_time=0.2, - ) - - assert len(writer.events) == len(wandb_calls) == 1 - assert writer.events[0].step == wandb_calls[0]["step"] == 4 - tb_payload = _batched_scalar_map(writer) - wandb_payload = wandb_calls[0]["payload"] - assert set(wandb_payload) == set(tb_payload) - for key, value in wandb_payload.items(): - assert value == pytest.approx(tb_payload[key]) - - -def test_onpolicy_backend_uses_canonical_reward_and_loss_tags() -> None: - logger = OnPolicyLogger(log_backend="none", num_envs=10, num_steps=3) - writer = _BatchedWriter() - logger._tb_writer = writer - - logger.log_step( - iteration=2, - metrics={"Loss/surrogate": 1.0}, - return_mean_ep100=2.0, - reward_components={"alive": 0.5}, - collect_time=0.1, - train_time=0.2, - ) - - assert len(writer.events) == 1 - assert writer.events[0].step == 2 - scalars = _batched_scalar_map(writer) - assert scalars["Loss/surrogate"] == pytest.approx(1.0) - assert scalars["Train/mean_reward"] == pytest.approx(2.0) - assert scalars["reward/alive"] == pytest.approx(0.5) - assert scalars["Perf/total_fps"] == pytest.approx(100.0) - assert scalars["Perf/collection_time"] == pytest.approx(0.1) - assert scalars["Perf/learning_time"] == pytest.approx(0.2) - assert "Train/iteration" not in scalars - assert "Perf/iteration_time" not in scalars - assert {"reward/mean", "reward/mean_ep100", "perf/steps_per_sec"}.isdisjoint(scalars) - - -def test_onpolicy_source_episode_return_owner_fails_closed() -> None: - logger = OnPolicyLogger(log_backend="none") - - with pytest.raises(ValueError, match="logger-owned metrics"): - logger.log_step( - iteration=1, - metrics={"Train/mean_reward": 1.0}, - return_mean_ep100=2.0, - ) - - -def test_onpolicy_runner_iteration_metric_fails_closed() -> None: - logger = OnPolicyLogger(log_backend="none") - - with pytest.raises(ValueError, match="iteration as the step axis"): - logger.log_step(iteration=1, metrics={"Train/iteration": 1.0}) diff --git a/tests/rl/runtime/test_device.py b/tests/rl/runtime/test_device.py index 9d1033cbc..c7d6b056d 100644 --- a/tests/rl/runtime/test_device.py +++ b/tests/rl/runtime/test_device.py @@ -1,120 +1,20 @@ -"""Torch device alias resolution for the RL runtime (owner: rl.runtime.device). +"""Torch device runtime primitives for the RL runtime (owner: rl.runtime.device). -Merged from unilab_rl @ 3654e4b (unilab-rl 1.4.15) ``tests/utils/test_device.py``. -Host hardware-info collection is owned by :mod:`unilab.utils.device` and -covered by ``tests/utils/test_device.py``; backend process-device routing is -owned by :mod:`unilab.base.process_device` and covered by -``tests/base/backend/test_process_device.py``. +Merged from unilab_rl @ 3654e4b (unilab-rl 1.4.15), previously +``uni_rl.utils.device``. Host hardware-info collection is owned by +:mod:`unilab.utils.device` and covered by ``tests/utils/test_device.py``; +backend process-device routing is owned by :mod:`unilab.base.process_device` +and covered by ``tests/base/backend/test_process_device.py``. """ from __future__ import annotations -from types import SimpleNamespace - import pytest import torch import unilab.rl.runtime.device as device_mod -def _patch_devices( - monkeypatch: pytest.MonkeyPatch, - *, - cuda: bool = False, - cuda_count: int = 0, - xpu: bool = False, - xpu_count: int = 0, - mps: bool = False, -) -> None: - monkeypatch.setattr(device_mod.torch.cuda, "is_available", lambda: cuda) - monkeypatch.setattr(device_mod.torch.cuda, "device_count", lambda: cuda_count) - monkeypatch.setattr( - device_mod.torch, - "xpu", - SimpleNamespace( - is_available=lambda: xpu, - device_count=lambda: xpu_count, - ), - raising=False, - ) - monkeypatch.setattr(device_mod.torch.backends.mps, "is_available", lambda: mps) - - -def test_resolve_torch_device_alias_defaults_to_cpu(monkeypatch: pytest.MonkeyPatch) -> None: - _patch_devices(monkeypatch) - - assert device_mod.resolve_torch_device_alias(None) == "cpu" - assert device_mod.resolve_torch_device_alias("cpu") == "cpu" - - -def test_resolve_torch_device_alias_gpu_prefers_cuda( - monkeypatch: pytest.MonkeyPatch, -) -> None: - _patch_devices(monkeypatch, cuda=True, cuda_count=2, mps=True) - - assert device_mod.resolve_torch_device_alias("gpu") == "cuda" - assert device_mod.resolve_torch_device_alias("gpu:1") == "cuda:1" - - -def test_resolve_torch_device_alias_gpu_uses_xpu_before_mps( - monkeypatch: pytest.MonkeyPatch, -) -> None: - _patch_devices(monkeypatch, xpu=True, xpu_count=2, mps=True) - - assert device_mod.resolve_torch_device_alias("gpu") == "xpu" - assert device_mod.resolve_torch_device_alias("gpu:1") == "xpu:1" - - -@pytest.mark.parametrize("alias", ["gpu", "gpu:0"]) -def test_resolve_torch_device_alias_macos_compat_maps_abstract_gpu_to_mps( - monkeypatch: pytest.MonkeyPatch, - alias: str, -) -> None: - _patch_devices(monkeypatch, mps=True) - - assert device_mod.resolve_torch_device_alias(alias) == "mps" - - -@pytest.mark.parametrize("alias", ["cuda", "cuda:0"]) -def test_resolve_torch_device_alias_does_not_map_concrete_cuda_to_mps( - monkeypatch: pytest.MonkeyPatch, - alias: str, -) -> None: - _patch_devices(monkeypatch, mps=True) - - with pytest.raises(ValueError, match="CUDA is unavailable"): - device_mod.resolve_torch_device_alias(alias) - - -@pytest.mark.parametrize("alias", ["gpu:1", "mps:1"]) -def test_resolve_torch_device_alias_mps_rejects_nonzero_index( - monkeypatch: pytest.MonkeyPatch, - alias: str, -) -> None: - _patch_devices(monkeypatch, mps=True) - - with pytest.raises(ValueError, match="MPS"): - device_mod.resolve_torch_device_alias(alias) - - -def test_resolve_torch_device_alias_rejects_missing_cuda_index( - monkeypatch: pytest.MonkeyPatch, -) -> None: - _patch_devices(monkeypatch, cuda=True, cuda_count=1) - - with pytest.raises(ValueError, match="only 1 cuda device"): - device_mod.resolve_torch_device_alias("gpu:1") - - -def test_resolve_torch_device_alias_rejects_unavailable_accelerator( - monkeypatch: pytest.MonkeyPatch, -) -> None: - _patch_devices(monkeypatch) - - with pytest.raises(ValueError, match="none is available"): - device_mod.resolve_torch_device_alias("gpu") - - def test_sync_device_uses_one_cuda_stream_api(monkeypatch: pytest.MonkeyPatch) -> None: calls: list[tuple[str, torch.device]] = [] diff --git a/tests/scripts/test_train_scripts.py b/tests/scripts/test_train_scripts.py index 2c73cc4c4..045e21b76 100644 --- a/tests/scripts/test_train_scripts.py +++ b/tests/scripts/test_train_scripts.py @@ -944,12 +944,10 @@ def test_build_ppo_play_env_cfg_override_keeps_task_owned_manager_scene( assert env_cfg_override["scene"]["entities"]["robot"]["joint_names"] -def test_run_native_viewer_play_loop_uses_render_spacing_and_offset_mode(): +def test_native_viewer_playback_uses_render_spacing_and_offset_mode(): import torch from tensordict import TensorDict - from unilab.visualization.playback import run_native_viewer_play_loop - class FakePolicy: def __call__(self, obs): batch = obs.batch_size[0] @@ -1016,8 +1014,7 @@ def step(self, actions): wrapped_env = FakeWrapper() policy = FakePolicy() - run_native_viewer_play_loop( - wrapped_env.env, + wrapped_env.env.run_playback( render_spacing=2.5, render_offset_mode="zero", num_steps=3, @@ -1115,9 +1112,7 @@ def test_appo_host_bridge_carriers_follow_collector_tensor_device_auto(monkeypat assert explicit_cuda["env_cfg_overrides"]["collector_tensor_device"] == "cuda" -def test_run_native_viewer_play_loop_runs_without_physics_state(): - from unilab.visualization.playback import run_native_viewer_play_loop - +def test_native_viewer_playback_runs_without_physics_state(): class FakeActor: def __call__(self, td): batch = td.batch_size[0] @@ -1213,7 +1208,7 @@ def _step(obs: torch.Tensor) -> torch.Tensor: if env.state is None: env.init_state() - run_native_viewer_play_loop(env, num_steps=3, initialize=_reset_obs, step=_step) + env.run_playback(num_steps=3, initialize=_reset_obs, step=_step) assert env.init_state_calls == 1 assert env.reset_calls == 1 @@ -1618,25 +1613,6 @@ def test_resolve_checkpoint_empty_run_dir(tmp_path): assert path is None -def test_offpolicy_extract_reset_obs_handles_two_tuple(): - from unilab.visualization.interactive_playback import extract_reset_obs - - obs = {"obs": "value"} - - result = extract_reset_obs((obs, {"info": 1})) - - assert result is obs - - -def test_offpolicy_extract_reset_obs_rejects_three_tuple(): - from unilab.visualization.interactive_playback import extract_reset_obs - - obs = {"obs": "value"} - - with pytest.raises(ValueError, match="Unexpected env.reset return format"): - extract_reset_obs(("ignored", obs, {"info": 1})) - - def test_offpolicy_resolve_play_obs_dims_ignore_critic(): from unilab.visualization.interactive_playback import resolve_play_obs_dims diff --git a/tests/tasks/test_g1_motion_fixed_shape.py b/tests/tasks/test_g1_motion_fixed_shape.py index f926a98e0..184dc76c8 100644 --- a/tests/tasks/test_g1_motion_fixed_shape.py +++ b/tests/tasks/test_g1_motion_fixed_shape.py @@ -56,9 +56,7 @@ def _make_env(num_envs: int, **flags): cfg = ManagerBasedRlEnvCfg() apply_cfg_overrides( cfg, - EnvConfigAdapter( - owner, root_dir=ROOT_DIR, algo_name="flashsac" - ).build_task_env_cfg_override(), + EnvConfigAdapter(owner, root_dir=ROOT_DIR).build_task_env_cfg_override(), ) for name, value in flags.items(): setattr(cfg, name, value) diff --git a/tests/tasks/test_go2_tensor_runtime.py b/tests/tasks/test_go2_tensor_runtime.py deleted file mode 100644 index d1c058618..000000000 --- a/tests/tasks/test_go2_tensor_runtime.py +++ /dev/null @@ -1,469 +0,0 @@ -from __future__ import annotations - -import math - -import numpy as np -import pytest -import torch -from unisim.backend.base import ( - SelectedResetPublication, - TensorDataPlane, - TensorExecution, - TensorLifecycleCapabilities, - TensorProcessTopology, -) - -from unilab.tasks.locomotion.go2 import tensor_parity as tensor_parity_module -from unilab.tasks.locomotion.go2.tensor_parity import ( - GO2_ACTUATOR_NAMES, - GO2_JOINT_NAMES, - Go2ParityConfig, - Go2ParityRuntime, -) - -_HOME = np.array( - [0.0, 0.8, -1.5, 0.0, 0.8, -1.5, 0.0, 1.0, -1.5, 0.0, 1.0, -1.5], - dtype=np.float32, -) -_JOINT_TO_ACTUATOR = tuple( - GO2_ACTUATOR_NAMES.index(name.removesuffix("_joint")) for name in GO2_JOINT_NAMES -) - - -class FakeGo2DeviceBackend: - """SDK-free fake exercising the public tensor contract, not a real backend.""" - - backend_type = "fake-go2-device" - - def __init__(self, num_envs: int = 3): - self.num_envs = int(num_envs) - self.num_actuators = 12 - self.qpos = torch.zeros((self.num_envs, 19), dtype=torch.float32) - self.qpos[:, 2] = 0.3 - self.qpos[:, 3] = 1.0 - self.qpos[:, 7:] = torch.tensor(_HOME) - self.qvel = torch.zeros((self.num_envs, 18), dtype=torch.float32) - self.ctrl = torch.zeros((self.num_envs, 12), dtype=torch.float32) - self.sensors = torch.zeros((self.num_envs, 25), dtype=torch.float32) - self.state_negotiations = 0 - self.sensor_negotiations = 0 - self.step_calls = 0 - self.reset_calls = 0 - self.cpu_detour_calls = 0 - self._refresh_sensors() - - def get_tensor_execution(self) -> TensorExecution: - return TensorExecution.DEVICE_RESIDENT - - def get_tensor_capabilities(self) -> TensorLifecycleCapabilities: - return TensorLifecycleCapabilities( - execution=TensorExecution.DEVICE_RESIDENT, - state_views=True, - state_fields=frozenset({"qpos", "qvel"}), - sensor_views=True, - stepping=True, - selected_reset=True, - selected_reset_publication=SelectedResetPublication.AUTHORITATIVE_VIEWS, - mask_selected_reset=True, - process_topology=TensorProcessTopology.IN_PROCESS, - data_plane=TensorDataPlane.DIRECT, - stream_event_ownership="backend-owned synchronous current stream", - torch_devices=("cpu",), - ) - - def get_state_views(self, fields, device: str | torch.device = "cpu"): - assert tuple(fields or ()) == ("qpos", "qvel") - assert torch.device(device).type == "cpu" - self.state_negotiations += 1 - return {"qpos": self.qpos, "qvel": self.qvel} - - def get_sensor_view(self, name: str, device: str | torch.device = "cpu"): - assert torch.device(device).type == "cpu" - self.sensor_negotiations += 1 - layout = { - "gyro": (0, 3), - "local_linvel": (3, 3), - "upvector": (6, 3), - "FL_foot_contact": (9, 1), - "FR_foot_contact": (10, 1), - "RL_foot_contact": (11, 1), - "RR_foot_contact": (12, 1), - "FL_pos": (13, 3), - "FR_pos": (16, 3), - "RL_pos": (19, 3), - "RR_pos": (22, 3), - } - if name not in layout: - raise KeyError(name) - start, width = layout[name] - return self.sensors[:, start : start + width] - - def step_tensor(self, ctrl, nsteps: int = 1): - assert isinstance(ctrl, torch.Tensor) - assert ctrl.shape == self.ctrl.shape - assert ctrl.dtype is torch.float32 - assert bool(torch.isfinite(ctrl).all()) - self.ctrl.copy_(ctrl) - self.qpos[:, 2] += 0.01 * nsteps - self.qpos[:, 7:] += 0.02 * nsteps - self.qvel[:, :3] += 0.01 * nsteps - self.qvel[:, 3:6] -= 0.02 * nsteps - self._refresh_sensors() - self.step_calls += 1 - return {"ok": True} - - def set_state_tensor_mask(self, reset_mask, qpos, qvel, randomization=None): - assert randomization is None - assert reset_mask.dtype is torch.bool - assert reset_mask.shape == (self.num_envs,) - assert bool(torch.isfinite(qpos).all()) - assert bool(torch.isfinite(qvel).all()) - if not bool(reset_mask.any()): - return None - self.qpos[reset_mask] = qpos[reset_mask] - self.qvel[reset_mask] = qvel[reset_mask] - self._refresh_sensors(reset_mask) - self.reset_calls += 1 - return {"ok": True} - - def _refresh_sensors(self, reset_mask: torch.Tensor | None = None) -> None: - selected = torch.ones(self.num_envs, dtype=torch.bool) if reset_mask is None else reset_mask - if not bool(selected.any()): - return - w, x, y, z = self.qpos[selected, 3:7].unbind(dim=1) - self.sensors[selected, 0:3] = self.qvel[selected, 3:6] - self.sensors[selected, 3:6] = self.qvel[selected, 0:3] - self.sensors[selected, 6] = 2.0 * (x * z + w * y) - self.sensors[selected, 7] = 2.0 * (y * z - w * x) - self.sensors[selected, 8] = 1.0 - 2.0 * (x * x + y * y) - contact = (self.qpos[selected][:, [8, 11, 14, 17]] > 0.1).to(torch.float32) - self.sensors[selected, 9:13] = contact - self.sensors[selected, 13] = self.qpos[selected, 7] - self.sensors[selected, 16] = self.qpos[selected, 10] - self.sensors[selected, 19] = self.qpos[selected, 13] - self.sensors[selected, 22] = self.qpos[selected, 16] - - -class UnsupportedBackend: - backend_type = "fake-unsupported" - - def get_tensor_execution(self) -> TensorExecution: - return TensorExecution.UNSUPPORTED - - def get_tensor_capabilities(self) -> TensorLifecycleCapabilities: - return TensorLifecycleCapabilities(execution=TensorExecution.UNSUPPORTED) - - -def _reset_state(num_envs: int) -> tuple[torch.Tensor, torch.Tensor]: - qpos = torch.zeros((num_envs, 19), dtype=torch.float32) - qpos[:, 2] = 0.3 - qpos[:, 3] = 1.0 - qpos[:, 7:] = torch.tensor(_HOME) - qvel = torch.zeros((num_envs, 18), dtype=torch.float32) - return qpos, qvel - - -def _make_runtime( - cfg: Go2ParityConfig | None = None, -) -> tuple[FakeGo2DeviceBackend, Go2ParityRuntime]: - backend = FakeGo2DeviceBackend() - qpos, qvel = _reset_state(backend.num_envs) - command = torch.tensor( - [[0.4, -0.2, 0.3], [-0.3, 0.1, -0.2], [0.0, 0.0, 0.0]], dtype=torch.float32 - ) - runtime = Go2ParityRuntime( - backend, # pyright: ignore[reportArgumentType] - command=command, - reset_qpos=qpos, - reset_qvel=qvel, - cfg=cfg or Go2ParityConfig(), - ) - runtime.reset() - return backend, runtime - - -def test_go2_tensor_runtime_rejects_unsupported_backend_before_view_negotiation() -> None: - qpos, qvel = _reset_state(1) - with pytest.raises(RuntimeError, match="DEVICE_RESIDENT"): - Go2ParityRuntime( - UnsupportedBackend(), # pyright: ignore[reportArgumentType] - command=torch.zeros((1, 3)), - reset_qpos=qpos, - reset_qvel=qvel, - ) - - -def test_go2_full_tensor_lifecycle_matches_owner_formula_parity() -> None: - backend, runtime = _make_runtime() - actions = torch.tensor( - [ - [0.1] * 12, - [-0.2] * 12, - [0.3] * 12, - ], - dtype=torch.float32, - ) - state = runtime.step(actions) - - assert state.obs["policy"].shape == (3, 49) - assert state.obs["critic"].shape == (3, 52) - assert backend.step_calls == 1 - assert backend.state_negotiations == 1 - assert backend.sensor_negotiations == len(runtime.sensors) - assert backend.cpu_detour_calls == 0 - - expected_ctrl = torch.from_numpy(np.asarray(_HOME)[list(_JOINT_TO_ACTUATOR)]).repeat(3, 1) - expected_ctrl += 0.25 * actions - torch.testing.assert_close(backend.ctrl, expected_ctrl) - - gyro = backend.qvel[:, 3:6] - linvel = backend.qvel[:, 0:3] - upvector = backend.sensors[:, 6:9] - joint_pos = backend.qpos[:, 7:] - command = runtime.command - expected_policy = torch.cat( - ( - gyro, - -upvector, - joint_pos - torch.tensor(_HOME), - backend.qvel[:, 6:], - actions, - command, - torch.tensor([0.04, 0.54, 0.54, 0.04]).repeat(3, 1), - ), - dim=1, - ) - torch.testing.assert_close(state.obs["policy"], expected_policy) - torch.testing.assert_close(state.obs["critic"], torch.cat((expected_policy, linvel), dim=1)) - - expected = { - "tracking_lin_vel": torch.exp( - -torch.sum((command[:, :2] - linvel[:, :2]) ** 2, dim=1) / 0.25 - ), - "tracking_ang_vel": torch.exp(-((command[:, 2] - gyro[:, 2]) ** 2) / 0.25), - "lin_vel_z": linvel[:, 2] ** 2, - "ang_vel_xy": torch.sum(gyro[:, :2] ** 2, dim=1), - "base_height": (backend.qpos[:, 2] - 0.3) ** 2, - "action_rate": torch.sum(actions**2, dim=1), - "similar_to_default": torch.sum(torch.abs(joint_pos - torch.tensor(_HOME)), dim=1), - } - for name, values in expected.items(): - torch.testing.assert_close(runtime.reward_components[name], values) - - contact = backend.sensors[:, 9:13] > 0.1 - phase = torch.tensor([0.04, 0.54, 0.54, 0.04]).repeat(3, 1) - expected_contact = (contact == (phase < 0.6)).float().mean(dim=1) - torch.testing.assert_close(runtime.reward_components["contact"], expected_contact) - - heights = torch.stack( - ( - backend.sensors[:, 13], - backend.sensors[:, 16], - backend.sensors[:, 19], - backend.sensors[:, 22], - ), - dim=1, - ) - expected_swing = (torch.exp(-((heights - 0.1) ** 2) / 0.01) * (phase >= 0.6)).mean(dim=1) - torch.testing.assert_close(runtime.reward_components["swing_feet_z"], expected_swing) - assert not torch.any(state.terminated) - assert not torch.any(state.truncated) - - -def test_go2_mask_reset_updates_true_rows_and_preserves_false_rows() -> None: - backend, runtime = _make_runtime() - tilt = 1.2 - tilted_qpos = backend.qpos.clone() - tilted_qpos[0, 3:7] = torch.tensor( - [math.cos(tilt / 2), math.sin(tilt / 2), 0.0, 0.0], dtype=torch.float32 - ) - backend.qpos.copy_(tilted_qpos) - backend._refresh_sensors(torch.tensor([True, False, False])) # noqa: SLF001 - actions = (torch.arange(3, dtype=torch.float32).repeat(12, 1).t() * 0.1).contiguous() - state = runtime.step(actions) - assert state.terminated.tolist() == [True, False, False] - - reset_mask = state.terminated | state.truncated - qpos_before = backend.qpos.clone() - qvel_before = backend.qvel.clone() - sensors_before = backend.sensors.clone() - negotiated_sensors = backend.sensor_negotiations - - reset_obs = runtime.reset(reset_mask) - - assert reset_mask.tolist() == [True, False, False] - assert backend.reset_calls == 2 - assert backend.sensor_negotiations == negotiated_sensors - torch.testing.assert_close(backend.qpos[0], runtime.reset_qpos[0]) - torch.testing.assert_close(backend.qvel[0], runtime.reset_qvel[0]) - torch.testing.assert_close(backend.qpos[1:], qpos_before[1:]) - torch.testing.assert_close(backend.qvel[1:], qvel_before[1:]) - torch.testing.assert_close(backend.sensors[1:], sensors_before[1:]) - assert torch.count_nonzero(reset_obs["policy"][0, 30:42]) == 0 - assert torch.count_nonzero(reset_obs["policy"][1:, 30:42]) == 24 - assert runtime._steps.tolist() == [0, 1, 1] # noqa: SLF001 - - -def test_go2_all_false_reset_is_noop_and_preserves_every_row() -> None: - backend, runtime = _make_runtime() - actions = torch.full((3, 12), 0.2, dtype=torch.float32) - runtime.step(actions) - qpos_before = backend.qpos.clone() - qvel_before = backend.qvel.clone() - sensors_before = backend.sensors.clone() - steps_before = runtime._steps.clone() # noqa: SLF001 - reset_calls = backend.reset_calls - - obs = runtime.reset(torch.zeros(3, dtype=torch.bool)) - - assert backend.reset_calls == reset_calls - torch.testing.assert_close(backend.qpos, qpos_before) - torch.testing.assert_close(backend.qvel, qvel_before) - torch.testing.assert_close(backend.sensors, sensors_before) - torch.testing.assert_close(runtime._steps, steps_before) # noqa: SLF001 - assert obs["policy"].shape == (3, 49) - assert obs["critic"].shape == (3, 52) - - -def test_go2_done_formula_parity_covers_bad_orientation_and_timeout() -> None: - backend, runtime = _make_runtime(Go2ParityConfig(max_episode_steps=1)) - tilt = 1.2 - for row in (0, 2): - backend.qpos[row, 3:7] = torch.tensor( - [math.cos(tilt / 2), math.sin(tilt / 2), 0.0, 0.0], dtype=torch.float32 - ) - backend._refresh_sensors(torch.tensor([True, False, True])) # noqa: SLF001 - state = runtime.step(torch.zeros((3, 12), dtype=torch.float32)) - assert state.terminated.tolist() == [True, False, True] - assert state.truncated.tolist() == [True, True, True] - expected_angle = torch.arccos(backend.sensors[:, 8].clamp(-1, 1)) - torch.testing.assert_close(state.terminated, expected_angle > 1.0471975511965976) - torch.testing.assert_close(state.truncated, torch.ones(3, dtype=torch.bool)) - - -def test_go2_runtime_does_not_add_backend_registrations() -> None: - from unilab.base import registry - - registry.ensure_registries() - assert registry.list_registered_envs()["Go2JoystickFlat"]["available_backends"] == [ - "mujoco", - "motrix", - "superdex", - "drake", - ] - - -def test_go2_tensor_runtime_rejects_non_bool_reset_input() -> None: - _, runtime = _make_runtime() - with pytest.raises(TypeError, match="one-dimensional bool"): - runtime.reset(torch.tensor([0, 0])) - - -def test_go2_tensor_runtime_rejects_wrong_reset_width() -> None: - _, runtime = _make_runtime() - with pytest.raises(ValueError, match="reset mask shape"): - runtime.reset(torch.ones(2, dtype=torch.bool)) - - -def test_go2_tensor_runtime_fails_closed_without_mask_capability() -> None: - class NoMaskBackend(FakeGo2DeviceBackend): - def get_tensor_capabilities(self): - capabilities = super().get_tensor_capabilities() - return TensorLifecycleCapabilities( - **{**vars(capabilities), "mask_selected_reset": False} - ) - - backend = NoMaskBackend(num_envs=1) - qpos, qvel = _reset_state(1) - with pytest.raises(RuntimeError, match="mask tensor reset"): - Go2ParityRuntime( - backend, # pyright: ignore[reportArgumentType] - command=torch.zeros((1, 3)), - reset_qpos=qpos, - reset_qvel=qvel, - ) - - -def test_go2_tensor_runtime_rejects_wrong_action_shape() -> None: - _, runtime = _make_runtime() - with pytest.raises(ValueError, match="actions shape"): - runtime.step(torch.zeros((2, 12), dtype=torch.float32)) - - -def test_go2_tensor_runtime_rejects_nonfinite_actions() -> None: - _, runtime = _make_runtime() - actions = torch.zeros((3, 12), dtype=torch.float32) - actions[1, 0] = float("nan") - with pytest.raises(ValueError, match="NaN"): - runtime.step(actions) - - -def test_go2_tensor_runtime_fails_closed_when_cuda_is_unavailable( - monkeypatch: pytest.MonkeyPatch, -) -> None: - backend = FakeGo2DeviceBackend(num_envs=1) - qpos, qvel = _reset_state(1) - monkeypatch.setattr( - tensor_parity_module.torch.cuda, - "is_available", - lambda: False, - ) - - with pytest.raises( - RuntimeError, - match="CUDA Go2 tensor parity requested but CUDA is unavailable", - ): - Go2ParityRuntime( - backend, # pyright: ignore[reportArgumentType] - command=torch.zeros((1, 3)), - reset_qpos=qpos, - reset_qvel=qvel, - device="cuda", - ) - - -@pytest.mark.skipif( - not torch.cuda.is_available(), - reason="wrong-device rejection requires an active CUDA context", -) -def test_go2_tensor_runtime_rejects_wrong_device_input() -> None: - backend = FakeGo2DeviceBackend(num_envs=1) - qpos, qvel = _reset_state(1) - with pytest.raises(RuntimeError, match="did not accept Torch device"): - Go2ParityRuntime( - backend, # pyright: ignore[reportArgumentType] - command=torch.zeros((1, 3)), - reset_qpos=qpos, - reset_qvel=qvel, - device="cuda", - ) - - -def test_go2_tensor_runtime_rejects_mismatched_backend_layout() -> None: - backend = FakeGo2DeviceBackend(num_envs=2) - backend.qpos = torch.zeros((2, 18), dtype=torch.float32) - qpos, qvel = _reset_state(2) - with pytest.raises(ValueError, match="qpos view shape"): - Go2ParityRuntime( - backend, # pyright: ignore[reportArgumentType] - command=torch.zeros((2, 3)), - reset_qpos=qpos, - reset_qvel=qvel, - ) - - -def test_go2_tensor_runtime_fails_closed_on_capability_mismatch() -> None: - class NoSteppingBackend(FakeGo2DeviceBackend): - def get_tensor_capabilities(self): - capabilities = super().get_tensor_capabilities() - return TensorLifecycleCapabilities(**{**vars(capabilities), "stepping": False}) - - backend = NoSteppingBackend(num_envs=1) - qpos, qvel = _reset_state(1) - with pytest.raises(RuntimeError, match="tensor stepping"): - Go2ParityRuntime( - backend, # pyright: ignore[reportArgumentType] - command=torch.zeros((1, 3)), - reset_qpos=qpos, - reset_qvel=qvel, - ) diff --git a/tests/tasks/test_tensor_runtime_components.py b/tests/tasks/test_tensor_runtime_components.py deleted file mode 100644 index 3a97d7a56..000000000 --- a/tests/tasks/test_tensor_runtime_components.py +++ /dev/null @@ -1,498 +0,0 @@ -from __future__ import annotations - -import pytest -import torch -from unisim.backend.base import ( - HostBridgeTransferPlan, - SelectedResetPublication, - TensorDataPlane, - TensorExecution, - TensorLifecycleCapabilities, - TensorProcessTopology, -) - -from unilab.managers._noise.noise_cfg import UniformNoiseCfg -from unilab.tasks.motion_tracking.common.tensor_runtime import ( - EpisodeMetrics, - ObservationNoise, - ResetMasks, - semantic_fingerprint, -) -from unilab.tasks.motion_tracking.common.tensor_state_store import DeviceStateStore - - -def test_semantic_fingerprint_rejects_semantic_mutation() -> None: - base = {"std": 0.2, "enabled": True} - mutated = dict(base) - mutated["std"] = 0.25 - - assert semantic_fingerprint("unilab.test.owner.v1", base) != semantic_fingerprint( - "unilab.test.owner.v1", mutated - ) - assert semantic_fingerprint("unilab.test.owner.v1", base) != semantic_fingerprint( - "unilab.test.other.v1", base - ) - - -def test_semantic_fingerprint_rejects_non_finite_scalar() -> None: - with pytest.raises(ValueError, match="non-finite scalar"): - semantic_fingerprint("unilab.test.owner.v1", {"std": float("nan")}) - - -def test_tensor_observation_noise_uses_declared_uniform_bounds() -> None: - noise = ObservationNoise.from_uniform_terms( - ( - UniformNoiseCfg(n_min=-0.1, n_max=0.2), - UniformNoiseCfg(n_min=-2.0, n_max=-1.0), - ), - (2, 3), - device=torch.device("cpu"), - ) - observations = torch.zeros((4, 6)) - generator = torch.Generator().manual_seed(17) - - corrupted = noise.apply(observations, cursor=1, generator=generator) - - assert corrupted is observations - assert bool((corrupted[:, 1:3] >= -0.1).all()) and bool((corrupted[:, 1:3] <= 0.2).all()) - assert bool((corrupted[:, 3:6] >= -2.0).all()) and bool((corrupted[:, 3:6] <= -1.0).all()) - torch.testing.assert_close(corrupted[:, 0], torch.zeros(4)) - - -def test_tensor_reset_plan_publishes_full_width_done_union() -> None: - plan = ResetMasks( - terminated=torch.tensor([False, True, False, True]), - truncated=torch.tensor([True, False, False, False]), - ) - - assert torch.equal(plan.done, torch.tensor([True, True, False, True])) - - -def test_tensor_reset_plan_fails_closed_on_mismatched_masks() -> None: - with pytest.raises(ValueError, match="matching one-dimensional"): - ResetMasks( - terminated=torch.tensor([False, True]), - truncated=torch.tensor([True, False, False]), - ) - with pytest.raises(TypeError, match="boolean"): - ResetMasks( - terminated=torch.tensor([0, 1]), - truncated=torch.tensor([1, 0]), - ) - - -def test_tensor_episode_metrics_include_terminal_then_reset() -> None: - metrics = EpisodeMetrics.create(3, torch.device("cpu")) - - metrics.update(torch.tensor([1.0, 2.0, 3.0]), torch.tensor([False, True, False])) - done_mask = torch.tensor([False, True, False]) - finished = metrics.finished_values(done_mask) - metrics.reset(done_mask) - metrics.update(torch.tensor([4.0, 5.0, 6.0]), torch.tensor([False, False, True])) - - torch.testing.assert_close( - finished, - torch.tensor([[0.0, 0.0], [2.0, 1.0], [0.0, 0.0]], dtype=torch.float64), - ) - torch.testing.assert_close(metrics.rewards, torch.tensor([5.0, 5.0, 9.0])) - torch.testing.assert_close(metrics.lengths, torch.tensor([2, 1, 2])) - metrics.reset(torch.tensor([False, True, True])) - torch.testing.assert_close(metrics.rewards, torch.tensor([5.0, 0.0, 0.0])) - torch.testing.assert_close(metrics.lengths, torch.tensor([2, 0, 0])) - - -class _HostBridgeBackend: - backend_type = "fake-host" - - def __init__(self): - self.steps = 0 - - def get_tensor_capabilities(self): - return TensorLifecycleCapabilities( - execution=TensorExecution.HOST_BRIDGE, - packed_host_bridge=True, - process_topology=TensorProcessTopology.IN_PROCESS, - data_plane=TensorDataPlane.HOST_BRIDGE, - stream_event_ownership="caller stream; fake synchronizes at host boundary", - torch_devices=("cpu", "cuda"), - ) - - def bind_host_bridge_io(self, spec): - backend = self - - class _Plan(HostBridgeTransferPlan): - def __init__(self, plan_spec): - self._spec = plan_spec - self.last_timing = {} - - @property - def spec(self): - return self._spec - - @property - def transfer_stats(self): - return {} - - def read_state_sensors(self): - return self._views() - - def write_control(self, ctrl): - return None - - def step(self, nsteps=1): - backend.steps += 1 - return None - - def apply_reset(self, env_indices, qpos, qvel, randomization=None): - raise NotImplementedError("host-bridge reset is not mask-capable") - - def read_selected_state_sensors(self): - raise NotImplementedError("host-bridge selected reads are unsupported") - - def close(self): - return None - - def _views(self): - state = backend.get_state_views(("qpos", "qvel"), device="cpu") - state["pelvis_local_linvel"] = backend.get_sensor_view( - "pelvis_local_linvel", device="cpu" - ) - state["torso_gyro"] = backend.get_sensor_view("torso_gyro", device="cpu") - state["track_pos_w_pelvis"] = backend.get_sensor_view( - "track_pos_w_pelvis", device="cpu" - ) - state["track_quat_w_pelvis"] = backend.get_sensor_view( - "track_quat_w_pelvis", device="cpu" - ) - state["track_linvel_w_pelvis"] = backend.get_sensor_view( - "track_linvel_w_pelvis", device="cpu" - ) - state["track_angvel_w_pelvis"] = backend.get_sensor_view( - "track_angvel_w_pelvis", device="cpu" - ) - return state - - return _Plan(spec) - - def get_state_views(self, names, device=None): - assert names == ("qpos", "qvel") - return { - "qpos": torch.tensor( - [[0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.25]], - device=device, - ), - "qvel": torch.zeros((1, 7), device=device), - } - - def get_sensor_view(self, name, device=None): - values = {"pelvis_local_linvel": (1.0, 2.0, 3.0), "torso_gyro": (-1.0, -2.0, -3.0)} - if name == "track_pos_w_pelvis": - return torch.tensor([[0.1, 0.2, 0.3]], device=device) - if name == "track_quat_w_pelvis": - return torch.tensor([[1.0, 0.0, 0.0, 0.0]], device=device) - if name in {"track_linvel_w_pelvis", "track_angvel_w_pelvis"}: - return torch.zeros((1, 3), device=device) - return torch.tensor(values[name], device=device).unsqueeze(0) - - -class _DeviceMaskResetBackend: - backend_type = "fake-device-reset" - - def __init__(self): - self.reset_calls = 0 - self.step_calls: list[tuple[torch.Tensor, int]] = [] - self.qpos = torch.tensor([[0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.25]]) - self.qvel = torch.zeros((1, 7)) - - def get_tensor_capabilities(self): - return TensorLifecycleCapabilities( - execution=TensorExecution.DEVICE_RESIDENT, - state_views=True, - state_fields=frozenset({"qpos", "qvel"}), - sensor_views=True, - stepping=True, - selected_reset=True, - selected_reset_publication=SelectedResetPublication.AUTHORITATIVE_VIEWS, - mask_selected_reset=True, - process_topology=TensorProcessTopology.IN_PROCESS, - data_plane=TensorDataPlane.DIRECT, - stream_event_ownership="backend invalidates derived views until readiness step", - torch_devices=("cpu",), - ) - - def set_state_tensor_mask(self, reset_mask, qpos, qvel, randomization=None): - assert randomization is None - assert reset_mask.shape == (self.qpos.shape[0],) - assert reset_mask.dtype is torch.bool - self.reset_calls += 1 - self.qpos[reset_mask] = qpos[reset_mask] - self.qvel[reset_mask] = qvel[reset_mask] - return {"timing": {"mask_reset_ms": 1.0}} - - def step_tensor(self, ctrl, nsteps=1): - self.step_calls.append((ctrl.detach().clone(), int(nsteps))) - return {"timing": {"readiness_ms": 2.0}} - - def get_state_views(self, names, device=None): - assert names == ("qpos", "qvel") - return {"qpos": self.qpos, "qvel": self.qvel} - - def get_sensor_view(self, name, device=None): - num_envs = self.qpos.shape[0] - if name == "pelvis_local_linvel": - return torch.tensor([[1.0, 2.0, 3.0]], device=device).repeat(num_envs, 1) - if name == "torso_gyro": - return torch.tensor([[-1.0, -2.0, -3.0]], device=device).repeat(num_envs, 1) - if name == "track_pos_w_pelvis": - return torch.tensor([[0.1, 0.2, 0.3]], device=device).repeat(num_envs, 1) - if name == "track_quat_w_pelvis": - return torch.tensor([[1.0, 0.0, 0.0, 0.0]], device=device).repeat(num_envs, 1) - if name in {"track_linvel_w_pelvis", "track_angvel_w_pelvis"}: - return torch.zeros((num_envs, 3), device=device) - return torch.tensor([1.0, 2.0, 3.0], device=device).repeat(num_envs, 1) - - -class _AdvancingNamedSensorBackend(_DeviceMaskResetBackend): - """A DEVICE_RESIDENT adapter that recomputes named sensors on each read.""" - - backend_type = "fake-device-advancing-sensors" - - def __init__(self): - super().__init__() - self.named_read_count = 0 - - def get_sensor_view(self, name, device=None): - if name in {"track_pos_w_pelvis", "track_quat_w_pelvis"}: - return super().get_sensor_view(name, device=device) - self.named_read_count += 1 - value = float(self.named_read_count) - return torch.full((1, 3), value, device=device) - - -def test_tensor_state_store_full_read_validates_layout_and_finite_state() -> None: - store = DeviceStateStore( - backend=_HostBridgeBackend(), # pyright: ignore[reportArgumentType] - device=torch.device("cpu"), - num_envs=1, - joint_qpos_ids=torch.tensor([7], dtype=torch.int64), - joint_qvel_ids=torch.tensor([6], dtype=torch.int64), - body_names=("pelvis",), - body_ids=torch.tensor([0], dtype=torch.int64), - ) - - store.read() - store.validate_finite() - - torch.testing.assert_close(store.joint_pos, torch.tensor([[0.25]])) - torch.testing.assert_close(store.linvel, torch.tensor([[1.0, 2.0, 3.0]])) - torch.testing.assert_close(store.robot_body_pos, torch.tensor([[[0.1, 0.2, 0.3]]])) - - -def _device_store(backend: _DeviceMaskResetBackend | None = None): - backend = backend or _DeviceMaskResetBackend() - return backend, DeviceStateStore( - backend=backend, # pyright: ignore[reportArgumentType] - device=torch.device("cpu"), - num_envs=1, - joint_qpos_ids=torch.tensor([7], dtype=torch.int64), - joint_qvel_ids=torch.tensor([6], dtype=torch.int64), - body_names=("pelvis",), - body_ids=torch.tensor([0], dtype=torch.int64), - ) - - -def test_tensor_state_store_mask_reset_updates_true_rows_only() -> None: - backend = _DeviceMaskResetBackend() - backend.qpos = backend.qpos.repeat(2, 1) - backend.qvel = backend.qvel.repeat(2, 1) - store = DeviceStateStore( - backend=backend, # pyright: ignore[reportArgumentType] - device=torch.device("cpu"), - num_envs=2, - joint_qpos_ids=torch.tensor([7], dtype=torch.int64), - joint_qvel_ids=torch.tensor([6], dtype=torch.int64), - body_names=("pelvis",), - body_ids=torch.tensor([0], dtype=torch.int64), - ) - store.read() - qpos_before, qvel_before = store.qviews() - reset_qpos = torch.full_like(qpos_before, -2.0) - reset_qvel = torch.full_like(qvel_before, -3.0) - all_false = torch.zeros(2, dtype=torch.bool) - - assert store.apply_reset(all_false, reset_qpos, reset_qvel) is None - assert backend.reset_calls == 0 - torch.testing.assert_close(store.qpos, qpos_before) - torch.testing.assert_close(store.qvel, qvel_before) - - reset_mask = torch.tensor([False, True]) - reset_result = store.apply_reset(reset_mask, reset_qpos, reset_qvel) - - assert reset_result == {"timing": {"mask_reset_ms": 1.0}} - assert backend.reset_calls == 1 - torch.testing.assert_close(store.qpos[0], qpos_before[0]) - torch.testing.assert_close(store.qvel[0], qvel_before[0]) - torch.testing.assert_close(store.qpos[1], reset_qpos[1]) - torch.testing.assert_close(store.qvel[1], reset_qvel[1]) - - -def test_tensor_state_store_reset_rejects_non_full_width_non_bool_masks() -> None: - _, store = _device_store() - qpos = torch.zeros((1, 8)) - qvel = torch.zeros((1, 7)) - with pytest.raises(ValueError, match="full-width bool"): - store.apply_reset(torch.zeros(1, dtype=torch.int64), qpos, qvel) - with pytest.raises(ValueError, match="full-width bool"): - store.apply_reset(torch.zeros(2, dtype=torch.bool), qpos, qvel) - - -def test_tensor_state_store_crosses_named_sensor_read_boundary_each_read() -> None: - backend = _AdvancingNamedSensorBackend() - store = DeviceStateStore( - backend=backend, # pyright: ignore[reportArgumentType] - device=torch.device("cpu"), - num_envs=1, - joint_qpos_ids=torch.tensor([7], dtype=torch.int64), - joint_qvel_ids=torch.tensor([6], dtype=torch.int64), - body_names=("pelvis",), - body_ids=torch.tensor([0], dtype=torch.int64), - ) - - store.read() - first = store.linvel.clone() - store.read() - second = store.linvel.clone() - - torch.testing.assert_close(first, torch.ones((1, 3))) - torch.testing.assert_close(second, torch.full((1, 3), 5.0)) - torch.testing.assert_close(store.gyro, torch.full((1, 3), 6.0)) - - -def test_tensor_state_store_reset_fails_closed_for_host_bridge_execution() -> None: - store = DeviceStateStore( - backend=_HostBridgeBackend(), # pyright: ignore[reportArgumentType] - device=torch.device("cpu"), - num_envs=1, - joint_qpos_ids=torch.tensor([7], dtype=torch.int64), - joint_qvel_ids=torch.tensor([6], dtype=torch.int64), - body_names=("pelvis",), - body_ids=torch.tensor([0], dtype=torch.int64), - ) - store.read() - - with pytest.raises(NotImplementedError, match="DEVICE_RESIDENT"): - store.apply_reset(torch.ones(1, dtype=torch.bool), torch.zeros((1, 8)), torch.zeros((1, 7))) - - -def test_tensor_state_store_reset_fails_closed_without_mask_capability() -> None: - class NoMaskBackend(_DeviceMaskResetBackend): - def get_tensor_capabilities(self): - capabilities = super().get_tensor_capabilities() - return TensorLifecycleCapabilities( - **{**vars(capabilities), "mask_selected_reset": False} - ) - - _, store = _device_store(NoMaskBackend()) - with pytest.raises(NotImplementedError, match="mask_selected_reset"): - store.apply_reset(torch.ones(1, dtype=torch.bool), torch.zeros((1, 8)), torch.zeros((1, 7))) - - -def test_tensor_state_store_has_no_legacy_host_state_fallback() -> None: - backend = _HostBridgeBackend() - store = DeviceStateStore( - backend=backend, # pyright: ignore[reportArgumentType] - device=torch.device("cpu"), - num_envs=1, - joint_qpos_ids=torch.tensor([7], dtype=torch.int64), - joint_qvel_ids=torch.tensor([6], dtype=torch.int64), - body_names=("pelvis",), - body_ids=torch.tensor([0], dtype=torch.int64), - ) - legacy_methods = ( - "get_body_pos_w", - "get_body_quat_w", - "get_body_lin_vel_w", - "get_body_ang_vel_w", - ) - - for method in legacy_methods: - assert not hasattr(backend, method) - - store.read() - - -def test_tensor_state_store_rejects_unsupported_backend_before_read() -> None: - class UnsupportedBackend: - backend_type = "fake-unsupported" - - def get_tensor_capabilities(self): - return TensorLifecycleCapabilities(execution=TensorExecution.UNSUPPORTED) - - with pytest.raises(RuntimeError, match="DEVICE_RESIDENT or HOST_BRIDGE"): - DeviceStateStore( - backend=UnsupportedBackend(), # pyright: ignore[reportArgumentType] - device=torch.device("cpu"), - num_envs=1, - joint_qpos_ids=torch.tensor([0], dtype=torch.int64), - joint_qvel_ids=torch.tensor([0], dtype=torch.int64), - body_names=("pelvis",), - body_ids=torch.tensor([0], dtype=torch.int64), - ) - - -@pytest.mark.skipif(not torch.cuda.is_available(), reason="CUDA is unavailable") -@pytest.mark.parametrize("exact_device", [False, True]) -def test_tensor_state_store_accepts_cuda_family_and_current_exact_device(exact_device) -> None: - class Backend(_HostBridgeBackend): - def get_tensor_capabilities(self): - torch_devices = ("cuda",) - if exact_device: - torch_devices = (f"cuda:{torch.cuda.current_device()}",) - return TensorLifecycleCapabilities( - execution=TensorExecution.HOST_BRIDGE, - packed_host_bridge=True, - process_topology=TensorProcessTopology.IN_PROCESS, - data_plane=TensorDataPlane.HOST_BRIDGE, - stream_event_ownership="caller stream; fake synchronizes at host boundary", - torch_devices=torch_devices, - ) - - current = torch.device("cuda", index=torch.cuda.current_device()) - store = DeviceStateStore( - backend=Backend(), # pyright: ignore[reportArgumentType] - device=torch.device("cuda"), - num_envs=1, - joint_qpos_ids=torch.tensor([7], dtype=torch.int64), - joint_qvel_ids=torch.tensor([6], dtype=torch.int64), - body_names=("pelvis",), - body_ids=torch.tensor([0], dtype=torch.int64), - ) - - assert store.device == current - - -@pytest.mark.skipif(not torch.cuda.is_available(), reason="CUDA is unavailable") -def test_tensor_state_store_rejects_wrong_exact_cuda_device_before_allocation() -> None: - class Backend: - backend_type = "fake-wrong-cuda" - - def get_tensor_capabilities(self): - wrong_index = (torch.cuda.current_device() + 1) % max(2, torch.cuda.device_count() + 1) - return TensorLifecycleCapabilities( - execution=TensorExecution.DEVICE_RESIDENT, - process_topology=TensorProcessTopology.IN_PROCESS, - data_plane=TensorDataPlane.DIRECT, - stream_event_ownership="backend completes fake lifecycle", - torch_devices=(f"cuda:{wrong_index}",), - ) - - with pytest.raises(RuntimeError, match="did not accept Tensor device"): - DeviceStateStore( - backend=Backend(), # pyright: ignore[reportArgumentType] - device=torch.device("cuda"), - num_envs=1, - joint_qpos_ids=torch.tensor([7], dtype=torch.int64), - joint_qvel_ids=torch.tensor([6], dtype=torch.int64), - body_names=("pelvis",), - body_ids=torch.tensor([0], dtype=torch.int64), - ) diff --git a/tests/training/test_training_helpers.py b/tests/training/test_training_helpers.py index 1c38fb125..9847f8e43 100644 --- a/tests/training/test_training_helpers.py +++ b/tests/training/test_training_helpers.py @@ -33,7 +33,6 @@ get_latest_run, resolve_checkpoint_path, ) -from unilab.visualization.playback import render_play_mode _ROOT_DIR = Path(__file__).resolve().parents[2] _CONF_DIR = _ROOT_DIR / "src" / "unilab" / "conf" @@ -279,7 +278,7 @@ def test_backend_adapter_env_cfg_override_for_sac_g1_walk_flat(): """Env cfg override carries reward + env preset fields. Algo is NOT touched.""" cfg = _offpolicy_cfg(["task=g1_walk_flat/mujoco"]) - adapter = EnvConfigAdapter(cfg, root_dir=_ROOT_DIR, algo_name="sac") + adapter = EnvConfigAdapter(cfg, root_dir=_ROOT_DIR) env_cfg_override = adapter.build_task_env_cfg_override() assert env_cfg_override["rewards"]["tracking_lin_vel"]["weight"] == pytest.approx(2.0) @@ -290,9 +289,7 @@ def test_backend_adapter_env_cfg_override_for_sac_g1_walk_flat(): def test_backend_adapter_preserves_mask_reset_owner_yaml(): cfg = _offpolicy_cfg(["task=g1_walk_flat/mjwarp"]) - override = EnvConfigAdapter( - cfg, root_dir=_ROOT_DIR, algo_name="sac" - ).build_task_env_cfg_override() + override = EnvConfigAdapter(cfg, root_dir=_ROOT_DIR).build_task_env_cfg_override() assert ( override["events"]["reset_scene_to_default"]["func"] == "unilab.envs.mdp.skip_scene_reset" ) @@ -306,12 +303,12 @@ def test_backend_adapter_injects_superdex_serial_mode_only_for_interactive_play( interactive = _ppo_cfg( ["task=go2_joystick_flat/superdex", "training.play_render_mode=interactive"] ) - adapter = EnvConfigAdapter(interactive, root_dir=_ROOT_DIR, algo_name="ppo") + adapter = EnvConfigAdapter(interactive, root_dir=_ROOT_DIR) assert "superdex_execution_mode" not in adapter.build_task_env_cfg_override() assert adapter.build_play_env_cfg_override()["superdex_execution_mode"] == "serial" record = _ppo_cfg(["task=go2_joystick_flat/superdex", "training.play_render_mode=record"]) - record_override = EnvConfigAdapter(record, root_dir=_ROOT_DIR, algo_name="ppo") + record_override = EnvConfigAdapter(record, root_dir=_ROOT_DIR) assert "superdex_execution_mode" not in record_override.build_play_env_cfg_override() @@ -327,7 +324,6 @@ def _fake_materializer(source_model_file: str, **kwargs) -> str: env_cfg_override = EnvConfigAdapter( cfg, root_dir=_ROOT_DIR, - algo_name="ppo", scene_materializer=_fake_materializer, ).build_play_env_cfg_override() @@ -416,12 +412,14 @@ def render(self): env = FakeEnv() seen: list[int] = [] - result = render_play_mode( - env, + result = env.run_playback( initialize=lambda: 0, step=lambda obs: seen.append(obs) or obs + 1, num_steps=3, + output_video=None, render_spacing=2.5, + render_offset_mode=None, + camera_kwargs=None, ) assert result is None @@ -566,13 +564,13 @@ def capture_video_frame(self) -> np.ndarray: env = FakeEnv() output_path = tmp_path / "motrix.mp4" - result = render_play_mode( - env, + result = env.run_playback( initialize=lambda: 0, step=lambda obs: obs + 1, num_steps=2, output_video=output_path, render_spacing=2.5, + render_offset_mode=None, camera_kwargs={"cam_distance": 3.0}, ) @@ -637,8 +635,7 @@ def capture_video_frame(self) -> np.ndarray: env = FakeEnv() output_path = tmp_path / "motrix_interactive.mp4" with pytest.raises(ValueError, match="Motrix video recording requires headless=true"): - render_play_mode( - env, + env.run_playback( initialize=lambda: 0, step=lambda obs: obs + 1, num_steps=2, @@ -646,6 +643,8 @@ def capture_video_frame(self) -> np.ndarray: headless=False, record_video=True, render_spacing=1.5, + render_offset_mode=None, + camera_kwargs=None, ) assert env.init_calls == [] @@ -694,12 +693,14 @@ def _render_states_get_frames(state_list, model_file, **kwargs): env = FakeEnv() output_path = tmp_path / "play.mp4" - result = render_play_mode( - env, + result = env.run_playback( initialize=lambda: 0, step=lambda obs: obs + 1, num_steps=2, output_video=output_path, + render_spacing=None, + frame_state_getter=None, + camera_kwargs=None, ) assert result == str(output_path) @@ -782,12 +783,14 @@ def _render_states_get_frames(state_list, model_file, **kwargs): env = FakeEnv() output_path = tmp_path / "play.mp4" - result = render_play_mode( - env, + result = env.run_playback( initialize=lambda: 0, step=lambda obs: obs + 1, num_steps=2, output_video=output_path, + render_spacing=None, + frame_state_getter=None, + camera_kwargs=None, ) assert result == str(output_path) @@ -814,10 +817,12 @@ def run_playback(self, **kwargs): return run_mujoco_playback(env=self, **kwargs) with pytest.raises(NotImplementedError, match="unsupported"): - render_play_mode( - FakeEnv(), + FakeEnv().run_playback( initialize=lambda: 0, step=lambda obs: obs + 1, num_steps=1, output_video=tmp_path / "play.mp4", + render_spacing=None, + frame_state_getter=None, + camera_kwargs=None, ) diff --git a/tests/utils/test_experiment_tracking.py b/tests/utils/test_experiment_tracking.py index 57b9621e9..639d14044 100644 --- a/tests/utils/test_experiment_tracking.py +++ b/tests/utils/test_experiment_tracking.py @@ -10,7 +10,7 @@ import unilab.rl.logging.base as base_module import unilab.training.experiment as experiment_module -from unilab.rl.logging import OffPolicyLogger, OnPolicyLogger +from unilab.rl.logging import OffPolicyLogger from unilab.training.experiment import ExperimentTracker, build_wandb_settings @@ -142,42 +142,6 @@ def _fake_time() -> float: logger.close() -def test_onpolicy_logger_uses_offpolicy_terminal_layout(): - logger = OnPolicyLogger( - algo_name="PPO", - env_name="Go2JoystickFlat", - max_iterations=10, - num_envs=4, - num_steps=8, - log_backend="no_print", - ) - logger.start() - logger.log_step( - iteration=1, - metrics={"Loss/surrogate": 0.1, "Loss/value": 0.2}, - return_mean_ep100=3.0, - collect_time=0.02, - train_time=0.03, - ) - logger.update_mean_episode_length(12.0) - - console = Console(record=True, width=120) - console.print(logger._build_display()) - output = console.export_text() - - assert "Losses & Metrics" in output - assert "Learner" in output - assert "Collector" in output - assert "Train" in output - assert "Collect" in output - assert "Steps/s" in output - assert "Rollout Steps" not in output - assert "Steps/Env" not in output - assert "Policy Metrics" not in output - - logger.close() - - def test_offpolicy_logger_terminal_keeps_core_bottleneck_timing_rows(): # unilab.rl.logging selects its terminal layout from the logger console width. monkeypatch = pytest.MonkeyPatch() @@ -432,24 +396,6 @@ def test_run_config_snapshot_passes_sim2sim_reader(tmp_path): assert resolve_sim2sim_config(tmp_path, target) is target -def test_onpolicy_logger_reuses_existing_wandb_run(monkeypatch): - fake_run = _FakeRun() - fake_wandb = _FakeWandb(existing_run=fake_run) - monkeypatch.setitem(sys.modules, "wandb", fake_wandb) - - logger = OnPolicyLogger( - algo_name="PPO", - env_name="Go2JoystickFlat", - log_backend="wandb", - ) - - assert logger._wandb_run is fake_run - assert fake_wandb.init_calls == [] - - logger.finish() - assert fake_wandb.finish_calls == 0 - - def test_offpolicy_logger_reuses_existing_wandb_run(monkeypatch): fake_run = _FakeRun() fake_wandb = _FakeWandb(existing_run=fake_run) @@ -468,41 +414,6 @@ def test_offpolicy_logger_reuses_existing_wandb_run(monkeypatch): assert fake_wandb.finish_calls == 0 -def test_onpolicy_logger_creates_and_finishes_owned_wandb_run(monkeypatch): - fake_wandb = _FakeWandb() - monkeypatch.setitem(sys.modules, "wandb", fake_wandb) - - logger = OnPolicyLogger( - algo_name="PPO", - env_name="Go2JoystickFlat", - log_backend="wandb", - wandb_project="unilab", - wandb_entity="team", - wandb_name="ppo-go2", - wandb_group="go2", - wandb_job_type="train", - wandb_tags=["ppo", "go2"], - wandb_notes="notes", - ) - - assert logger._owns_wandb_run is True - assert len(fake_wandb.init_calls) == 1 - init_call = fake_wandb.init_calls[0] - assert init_call["project"] == "unilab" - assert init_call["entity"] == "team" - assert init_call["name"] == "ppo-go2" - assert init_call["group"] == "go2" - assert init_call["job_type"] == "train" - assert init_call["tags"] == ["ppo", "go2"] - assert init_call["notes"] == "notes" - assert init_call["config"]["algo"] == "PPO" - assert init_call["config"]["env"] == "Go2JoystickFlat" - assert init_call["config"]["num_envs"] == 4096 - - logger.finish() - assert fake_wandb.finish_calls == 1 - - def test_offpolicy_logger_creates_and_finishes_owned_wandb_run(monkeypatch): fake_wandb = _FakeWandb() monkeypatch.setitem(sys.modules, "wandb", fake_wandb) diff --git a/tests/visualization/test_interactive_playback.py b/tests/visualization/test_interactive_playback.py index 7dbaac5de..5b5bf43f9 100644 --- a/tests/visualization/test_interactive_playback.py +++ b/tests/visualization/test_interactive_playback.py @@ -920,13 +920,12 @@ def __init__(self, cfg: Any, **kwargs: Any) -> None: monkeypatch.setattr(config_adapter, "materialize_scene_visual_override", sentinel_materializer) cfg = SimpleNamespace(training=SimpleNamespace(task_name="Task")) - adapter = build_play_backend_adapter(cfg, root_dir="/repo", algo_name="appo") + adapter = build_play_backend_adapter(cfg, root_dir="/repo") assert isinstance(adapter, FakeEnvConfigAdapter) assert captured == { "cfg": cfg, "root_dir": "/repo", - "algo_name": "appo", "scene_materializer": sentinel_materializer, } diff --git a/tests/visualization/test_playback_session.py b/tests/visualization/test_playback_session.py index 19c4d06ca..67d128f5c 100644 --- a/tests/visualization/test_playback_session.py +++ b/tests/visualization/test_playback_session.py @@ -12,7 +12,7 @@ from unisim.backend.base import CameraCfg, DebugPrimitive from unilab.base.base import EnvPlayCapabilities -from unilab.visualization.playback import camera_cfg_from_training, render_play_mode +from unilab.visualization.playback import camera_cfg_from_training from unilab.visualization.playback_session import SnapshotPlaybackSession @@ -230,8 +230,7 @@ def run_playback(self, **kwargs: Any) -> str: getter = lambda: None # noqa: E731 on_frame = lambda i, frame: frame # noqa: E731 - result = render_play_mode( - _Env(), + result = _Env().run_playback( initialize=lambda: None, step=lambda obs: obs, num_steps=1,