Skip to content

feat(conf): align flashsac g1_motion_tracking with sac and enforce same-dir base inheritance (ADR-0023) - #2614

Merged
TATP-233 merged 1 commit into
mainfrom
feat/issue-2613-task-sim-owner-base-inheritance
Nov 18, 2026
Merged

TATP-233 merged 1 commit into
mainfrom
feat/issue-2613-task-sim-owner-base-inheritance

Conversation

@TATP-233

Copy link
Copy Markdown
Collaborator

Summary

Closes #2613. Two coupled changes, governed by the new ADR-0023:

1. flashsac g1_motion_tracking aligns with the SAC owner contract

  • base.yaml now carries the same scene/observation/command/reward/termination contract as SAC: canonical training DR (base_com / encoder_bias / foot_friction reset terms + push_robot interval push), foot geom_names, and the biased actor joint observation (motion_joint_pos_rel_biased). Training budget already matched (2048 envs x 25000 iters); FlashSAC algo knobs stay at conf/flashsac/config.yaml defaults.
  • Backend leaves mirror the SAC per-backend DR shapes: motrix disables the push, mjwarp zeroes angular kicks, genesis disables friction and enables the body_mass/pd_gains subset. The Newton owner keeps its historical DR-free behavior with all four events explicitly null (no SAC Newton owner exists to align with, and Newton's public tensor mask reset does not support randomization).

2. Task sim owners inherit same-directory base.yaml only (ADR-0023)

  • All 33 backend leaves across sac/flashsac/appo/ppo now declare defaults: [/task/<task>/base, _self_]; cross-backend inheritance removed (10 violating leaves: g1_motion_tracking motrix/mjwarp/genesis/newton in four algo trees, go2_joystick_flat/superdex).
  • appo/ppo g1_motion_tracking gain the missing base.yaml; shared DR and training budgets move into base.yaml; leaves carry their full task_name/sim_backend identity per ADR-0003.
  • ADR-0023 records the rule; tests/config/test_config_system.py gains a structural guard test over every leaf.

Impact

  • Training behavior: unchanged except the flashsac g1_motion_tracking alignment itself. Composed-config snapshots (Hydra compose, 17 affected combos) diff key-identical before/after except flashsac g1_motion_tracking; remaining sac diffs are pure YAML key ordering.
  • Affects MuJoCo / MJWarp / Motrix / Genesis / Newton owner YAMLs for g1_motion_tracking; Linux.

Validation (final head 9d1bbaf7)

  • make test-all — 3041 passed, 37 skipped, 1 xfailed (includes make check: ruff + mypy/pyright clean)
  • Focused: pytest tests/config/ -q (19) and -m slow (44); pytest tests/scripts/test_train_scripts.py -m slow -k "g1_motion_tracking or superdex or go2_joystick" (7 passed, 2 pre-existing env failures now resolved after uv sync --all-extras); pytest tests/scripts/test_check_docs.py (20)
  • Docs: Sphinx html build (-n) clean; flashsac task no longer described as DR-free in tensor-runtime / sync-free-autoreset pages

Governing decision: {ADR-0023} (added in this PR); extends {ADR-0003}.

…me-dir base inheritance (ADR-0023)

- Align the flashsac g1_motion_tracking owner with the SAC contract:
  canonical DR events, foot geom_names, and the biased actor joint
  observation; training budget already matched. The Newton owner keeps
  its historical DR-free behavior with events explicitly nulled.
- Every task sim owner leaf now inherits only its same-directory
  base.yaml; cross-backend inheritance removed (sac/flashsac/appo/ppo
  g1_motion_tracking, ppo go2_joystick_flat/superdex). Shared DR and
  training budgets move into base.yaml; leaves carry their full
  task_name/sim_backend identity.
- Add ADR-0023 and a structural guard test; composed configs verified
  key-identical before/after except the flashsac alignment itself.

Training behavior: unchanged except flashsac g1_motion_tracking aligning
to the SAC owner. Affects MuJoCo, MJWarp, Motrix, Genesis, and Newton
owner YAMLs for g1_motion_tracking on Linux.

Ref #2613
@TATP-233
TATP-233 merged commit 433da40 into main Nov 18, 2026
12 checks passed
@TATP-233
TATP-233 deleted the feat/issue-2613-task-sim-owner-base-inheritance branch November 18, 2026 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Task sim owner YAMLs must inherit same-directory base.yaml only (ADR-0023)

1 participant