Commit c9dca35
authored
Name Newton coupled solvers in pretrained checkpoint paths (#7539)
# Description
`--checkpoint pretrained` aborted for every coupled task with
`ValueError: Unsupported Newton solver for pretrained checkpoints:
CouplerProxyCfg`, because the physics token was derived only from the
top-level Newton solver class and a coupled solver nests its solvers in
entries.
A Newton coupled solver is now named by its entry solvers in order
followed by its coupling scheme, so a proxy coupler over MJWarp and VBD
entries resolves to `newtonmjwarpvbdproxy`. Names for uncoupled solvers
are unchanged, and this matches the names the coupled checkpoints are
already published under. The physics token is no longer validated
against a closed set, since it is derived from the solver tree rather
than chosen from a fixed list. `train_and_publish_checkpoints.py` now
derives each job's physics token by resolving its preset selector, so
published filenames and the names `play` looks up cannot drift apart.
Fixes 6672531
Fixes 6684411
## Type of change
- Bug fix (non-breaking change which fixes an issue)
## Release backport
- [x] <!-- backport-active-release --> Backport this pull request to the
active release branch after it merges into `develop`
## Validation
`uv run isaaclab play --rl_library rsl_rl --task Isaac-Lift-Cable-Franka
--checkpoint pretrained --num_envs 4 --visualizer none` now fetches
`Isaac-Lift-Cable-Franka_newtonmjwarpvbdproxy_none_rsl_rl.pt` and loads
the policy, where it previously aborted before launch.
`Isaac-Lift-Cloth-Franka` and `Isaac-Lift-Soft-Franka` resolve to the
same token and are also published under it.
- `uv run --extra test python -m pytest
source/isaaclab_rl/test/test_pretrained_checkpoint.py
scripts/tools/test/test_train_and_publish_checkpoints.py -q` — 21 passed
- `uv run isaaclab -f`
## Checklist
- [x] I have read and understood the [contribution
guidelines](https://isaac-sim.github.io/IsaacLab/main/source/refs/contributing.html)
- [x] I have run the [`pre-commit` checks](https://pre-commit.com/) with
`./isaaclab.sh --format`
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] I have added a changelog fragment under
`source/<pkg>/changelog.d/` for every touched package (do **not** edit
`CHANGELOG.rst` or bump `extension.toml` — CI handles that)
- [x] I have added my name to the `CONTRIBUTORS.md` or my name already
exists there1 parent 40ada0f commit c9dca35
4 files changed
Lines changed: 62 additions & 9 deletions
File tree
- scripts/tools
- test
- source/isaaclab_rl
- changelog.d
- isaaclab_rl/utils
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
91 | 100 | | |
92 | 101 | | |
93 | 102 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
| 99 | + | |
99 | 100 | | |
100 | 101 | | |
101 | 102 | | |
| |||
263 | 264 | | |
264 | 265 | | |
265 | 266 | | |
266 | | - | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
267 | 272 | | |
268 | 273 | | |
269 | 274 | | |
| |||
274 | 279 | | |
275 | 280 | | |
276 | 281 | | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
277 | 295 | | |
278 | 296 | | |
279 | 297 | | |
| |||
329 | 347 | | |
330 | 348 | | |
331 | 349 | | |
332 | | - | |
| 350 | + | |
| 351 | + | |
333 | 352 | | |
334 | 353 | | |
335 | 354 | | |
| |||
Lines changed: 9 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
Lines changed: 23 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
83 | 83 | | |
84 | 84 | | |
85 | 85 | | |
86 | | - | |
87 | | - | |
| 86 | + | |
| 87 | + | |
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
| |||
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
102 | | - | |
| 102 | + | |
103 | 103 | | |
104 | 104 | | |
105 | 105 | | |
| |||
319 | 319 | | |
320 | 320 | | |
321 | 321 | | |
322 | | - | |
323 | | - | |
324 | | - | |
325 | | - | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
326 | 326 | | |
327 | 327 | | |
328 | 328 | | |
329 | 329 | | |
330 | 330 | | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
331 | 347 | | |
332 | 348 | | |
333 | 349 | | |
| |||
0 commit comments