Skip to content

Commit aafa923

Browse files
authored
Merge pull request #48 from TATP-233/feat/motrix-go1-g1-sync
feat: sync go1 motrix ppo/sac and g1 motrix ppo tuning, fix related bugs
2 parents f05e0db + 86661d6 commit aafa923

44 files changed

Lines changed: 988 additions & 138 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Install dependencies
4343
run: uv sync --extra dev
4444
- name: mypy
45-
run: uv run mypy unilab
45+
run: uv run mypy src/unilab
4646
- name: pyright
4747
run: uv run pyright
4848

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dist/
1616

1717
# Project specific
1818
logs/
19+
.worktrees/
1920
*.log
2021
.DS_Store
2122

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
# @package _global_
22
reward:
33
scales:
4-
tracking_lin_vel: 1.2
5-
tracking_ang_vel: 0.3
6-
lin_vel_z: -6.0
7-
ang_vel_xy: -0.15
8-
base_height: -120.0
9-
action_rate: -0.006
10-
similar_to_default: -0.12
11-
contact: 0.28
4+
tracking_lin_vel: 1.0
5+
tracking_ang_vel: 0.2
6+
lin_vel_z: -5.0
7+
ang_vel_xy: -0.1
8+
base_height: -100.0
9+
action_rate: -0.005
10+
similar_to_default: -0.1
1211
tracking_sigma: 0.25
1312
base_height_target: 0.3

‎conf/offpolicy/task/g1_sac.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,7 @@ algo:
1313
algo_params:
1414
alpha_init: 0.01
1515
target_entropy_ratio: 0.0
16+
motrix_legacy:
17+
enabled: true
18+
algo_overrides:
19+
use_symmetry: false

‎conf/offpolicy/task/go1_joystick.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,27 @@ training:
77
algo:
88
num_envs: 2048
99
max_iterations: 3000
10+
motrix_legacy:
11+
enabled: true
12+
applies_to:
13+
algo: sac
14+
algo_overrides:
15+
num_envs: 4096
16+
max_iterations: 2000
17+
env_cfg_override:
18+
legacy_motrix_profile:
19+
enabled: true
20+
command_vel_limit:
21+
- [0.5, 0.0, 0.0]
22+
- [0.5, 0.0, 0.0]
23+
reward_config:
24+
scales:
25+
tracking_lin_vel: 1.0
26+
tracking_ang_vel: 0.2
27+
lin_vel_z: -5.0
28+
ang_vel_xy: -0.1
29+
base_height: -100.0
30+
action_rate: -0.005
31+
similar_to_default: -0.1
32+
tracking_sigma: 0.25
33+
base_height_target: 0.3

‎conf/ppo/reward/g1_ppo_motrix.yaml‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
# @package _global_
22
reward:
33
scales:
4-
tracking_lin_vel: 2.4
5-
tracking_ang_vel: 0.3
6-
feet_phase: 1.2
7-
lin_vel_z: -1.2
8-
ang_vel_xy: -0.3
9-
base_height: -600.0
10-
orientation: -6.0
11-
action_rate: -0.012
12-
pose: -0.12
4+
tracking_lin_vel: 3.0
5+
tracking_ang_vel: 0.25
6+
forward_progress: 1.5
7+
under_speed: -1.0
8+
upper_body_pose: -0.05
9+
feet_phase: 0.5
10+
lin_vel_z: -1.0
11+
ang_vel_xy: -0.2
12+
base_height: -120.0
13+
orientation: -2.5
14+
action_rate: -0.005
15+
pose: -0.05
1316
tracking_sigma: 0.25
1417
gait_frequency: 1.5
1518
feet_phase_swing_height: 0.09
1619
feet_phase_tracking_sigma: 0.008
1720
base_height_target: 0.754
18-
min_base_height: 0.55
19-
max_tilt_deg: 25.0
21+
min_base_height: 0.5
22+
max_tilt_deg: 35.0
Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
# @package _global_
22
reward:
33
scales:
4-
tracking_lin_vel: 1.2
5-
tracking_ang_vel: 0.3
6-
lin_vel_z: -6.0
7-
ang_vel_xy: -0.15
8-
base_height: -120.0
9-
action_rate: -0.006
10-
similar_to_default: -0.12
11-
contact: 0.28
4+
tracking_lin_vel: 1.0
5+
tracking_ang_vel: 0.2
6+
lin_vel_z: -5.0
7+
ang_vel_xy: -0.1
8+
base_height: -100.0
9+
action_rate: -0.005
10+
similar_to_default: -0.1
1211
tracking_sigma: 0.25
1312
base_height_target: 0.3

‎conf/ppo/task/g1_joystick.yaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,50 @@ algo:
1212
- policy
1313
actor:
1414
- actor
15+
motrix_legacy:
16+
enabled: true
17+
algo_overrides:
18+
max_iterations: 151
19+
empirical_normalization: true
20+
obs_groups:
21+
actor:
22+
- policy
23+
policy:
24+
init_noise_std: 0.5
25+
algorithm:
26+
learning_rate: 3.0e-4
27+
entropy_coef: 5.0e-3
28+
env_cfg_override:
29+
reward_config:
30+
scales:
31+
tracking_lin_vel: 3.0
32+
tracking_ang_vel: 0.25
33+
forward_progress: 1.5
34+
under_speed: -1.0
35+
upper_body_pose: -0.05
36+
feet_phase: 0.5
37+
lin_vel_z: -1.0
38+
ang_vel_xy: -0.2
39+
base_height: -120.0
40+
orientation: -2.5
41+
action_rate: -0.005
42+
pose: -0.05
43+
tracking_sigma: 0.25
44+
gait_frequency: 1.5
45+
feet_phase_swing_height: 0.09
46+
feet_phase_tracking_sigma: 0.008
47+
base_height_target: 0.754
48+
min_base_height: 0.5
49+
max_tilt_deg: 35.0
50+
backend_overrides:
51+
enabled: true
52+
control_action_scale: 0.5
53+
command_vel_limit:
54+
- [0.45, 0.0, 0.0]
55+
- [0.55, 0.0, 0.0]
56+
gait_phase_init_mode: independent
57+
reset_base_qvel_limit: 0.05
58+
reward_scale_overrides:
59+
under_speed: -1.0
60+
upper_body_pose: -0.05
61+
tracking_ang_vel: 0.25

‎conf/ppo/task/go1_joystick.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,30 @@ algo:
1111
- policy
1212
actor:
1313
- actor
14+
motrix_legacy:
15+
enabled: true
16+
algo_overrides:
17+
max_iterations: 151
18+
empirical_normalization: true
19+
policy:
20+
init_noise_std: 0.5
21+
algorithm:
22+
learning_rate: 3.0e-4
23+
entropy_coef: 1.0e-3
24+
env_cfg_override:
25+
legacy_motrix_profile:
26+
enabled: true
27+
command_vel_limit:
28+
- [0.5, 0.0, 0.0]
29+
- [0.5, 0.0, 0.0]
30+
reward_config:
31+
scales:
32+
tracking_lin_vel: 1.0
33+
tracking_ang_vel: 0.2
34+
lin_vel_z: -5.0
35+
ang_vel_xy: -0.1
36+
base_height: -100.0
37+
action_rate: -0.005
38+
similar_to_default: -0.1
39+
tracking_sigma: 0.25
40+
base_height_target: 0.3

‎pyproject.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ mujoco-uni = { index = "test-pypi" }
5050
line-length = 100
5151
target-version = "py310"
5252
src = ["src"]
53+
exclude = [".history"]
5354

5455
[tool.ruff.lint]
5556
select = ["E", "F", "I", "N", "W"]

0 commit comments

Comments
 (0)