Skip to content

Commit 1f90f4c

Browse files
ooctipusaserifiAntoineRichardhujc7rubengrandia
authored
Sync fpgs-dev with develop (#6599)
# Description Merge current `develop` (`564a0083a00`) into `fpgs-dev` while retaining the FeatherPGS solver integration and tuned task presets. `develop` introduced the `SolverBase.reset` API and a side-effect-free solver factory contract after the previous public FeatherPGS Newton pin. This sync therefore also: - pins the public, reset-compatible `ooctipus/newton@186502cec5db4b80a4cc235c9a6f5e4266ee2c07` revision; - aligns `NewtonFeatherPGSManager` with the current `_create_solver` contract; - keeps the FeatherPGS Go1 and G1 presets while accepting the updated Kamino defaults; - preserves the centralized dependency ownership introduced on `develop`. ## Type of change - Bug fix (non-breaking change which fixes the stale branch and dependency incompatibility) ## Tests - `uv run -m newton.tests -k feather_pgs`: 25 passed. - `./isaaclab.sh -p -m pytest source/isaaclab/test/cli/test_uv_run_pyproject.py -q`: 6 passed. - IsaacLab formatting/lint hooks passed. The all-files merge-marker hook was skipped only for three license files added unchanged by `develop` whose license headings contain `=======`. The LFS pointer hook was skipped because this parent checkout has a local `.git/info/attributes` override disabling golden-image LFS; repository `.gitattributes` remains unchanged and correct. - Focused IsaacLab runtime test collection is unavailable in this isolated worktree because its wrapper selects system Python without NumPy/IsaacLab packages. The public Newton solver tests above ran with Warp 1.15 on RTX 5090 GPUs. ## Screenshots Not applicable. ## Checklist - [x] I have read and understood the contribution guidelines. - [x] I have run the applicable pre-commit checks with `./isaaclab.sh --format`. - [x] Documentation changes are not required for this branch sync. - [x] My changes generate no new warnings. - [x] I have added or updated tests for the merged manager contract and dependency pin. - [x] The existing FeatherPGS changelog fragment remains in place. - [x] My name already exists in `CONTRIBUTORS.md`. --------- Signed-off-by: Antoine RICHARD <antoiner@nvidia.com> Signed-off-by: Matthew Taylor <mataylor@nvidia.com> Signed-off-by: Advait Jayant <advait@vannalabs.ai> Signed-off-by: Asier Arranz <asier@nvidia.com> Signed-off-by: Lionel Gulich <lgulich@nvidia.com> Signed-off-by: Mustafa H <34825877+StafaH@users.noreply.github.com> Signed-off-by: Kelly Guo <kellyg@nvidia.com> Co-authored-by: Agon Serifi <39410867+aserifi@users.noreply.github.com> Co-authored-by: Antoine RICHARD <antoiner@nvidia.com> Co-authored-by: hujc <leo.hu.sh@gmail.com> Co-authored-by: Ruben Grandia <rubengrandia@gmail.com> Co-authored-by: Agon Serifi <agon.serifi@disney.com> Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: isaaclab-bot[bot] <282401363+isaaclab-bot[bot]@users.noreply.github.com> Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> Co-authored-by: Peter Verswyvelen <pverswyvelen@nvidia.com> Co-authored-by: pv-nvidia <peter.verswyvelen@gmail.com> Co-authored-by: Mike Yan Michelis <46975745+mmichelis@users.noreply.github.com> Co-authored-by: Matthew Taylor <mataylor@nvidia.com> Co-authored-by: hujc <jichuanh@nvidia.com> Co-authored-by: Piotr Barejko <pbarejko@nvidia.com> Co-authored-by: Mustafa H <34825877+StafaH@users.noreply.github.com> Co-authored-by: Richard Lei <rilei@nvidia.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Co-authored-by: nvsekkin <72572910+nvsekkin@users.noreply.github.com> Co-authored-by: Lynn <lynnhe02@gmail.com> Co-authored-by: Kelly Guo <kellyg@nvidia.com> Co-authored-by: Ruben D'Sa <rdsa@nvidia.com> Co-authored-by: Advait <advaitjk@gmail.com> Co-authored-by: Advait Jayant <advait@vannalabs.ai> Co-authored-by: matthewtrepte <mtrepte@nvidia.com> Co-authored-by: Daniela Hase <116915287+daniela-hase@users.noreply.github.com> Co-authored-by: r-schmitt <139814266+r-schmitt@users.noreply.github.com> Co-authored-by: Zeng Qingcheng <60593302+NeoZng@users.noreply.github.com> Co-authored-by: vidurv-nvidia <vidurv@nvidia.com> Co-authored-by: myurasov-nv <168484206+myurasov-nv@users.noreply.github.com> Co-authored-by: Mikhail Yuraaov <misha@mymbp4.local> Co-authored-by: Asier Arranz <asierarranz@gmail.com> Co-authored-by: Asier Arranz <asier@nvidia.com> Co-authored-by: HuiDong Chen <huidongc@nvidia.com> Co-authored-by: lgulich <22480644+lgulich@users.noreply.github.com> Co-authored-by: Maximilian Krause <maximiliank@nvidia.com> Co-authored-by: Mihail Yurasov <myurasov@nvidia.com> Co-authored-by: Rebecca Zhang <168459200+rebeccazhang0707@users.noreply.github.com> Co-authored-by: pv-nvidia <pv-nvidia@nvidia.com>
1 parent 3002557 commit 1f90f4c

1,096 files changed

Lines changed: 58903 additions & 13981 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../skills/user/create-environments
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../skills/user/convert-direct-to-manager
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../skills/user/debug-rl-training
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../skills/user/diagnose-joint-poses
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../skills/developer/coding-style
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../skills/user/migrate-2x-to-3x
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../skills/user/migrate-from-isaac-gym
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../skills/user/plan-manipulation-tasks
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../skills/user/prepare-assets-for-newton
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../skills/developer/pr-workflow

0 commit comments

Comments
 (0)