Commit caed3d0
committed
init
no more .mpt
Merge remote-tracking branch 'origin/main' into richard-unifympt
slim
policy spec handler
more concise
cleanup
simplify
Merge remote-tracking branch 'origin/main' into richard-unifympt
re-add
fix policy spex
Update packages/mettagrid/python/src/mettagrid/util/uri_resolvers/schemes.py
Co-authored-by: graphite-app[bot] <96075541+graphite-app[bot]@users.noreply.github.com>
Merge remote-tracking branch 'origin/main' into richard-unifympt
bundles
Merge remote-tracking branch 'origin/main' into richard-unifympt
Merge remote-tracking branch 'origin/main' into richard-unifympt
bundle
Merge remote-tracking branch 'origin/richard-unifympt' into richard-unifympt
Merge remote-tracking branch 'origin/main' into richard-unifympt
Merge remote-tracking branch 'origin/main' into richard-unifympt
Merge remote-tracking branch 'origin/main' into richard-unifympt
Merge remote-tracking branch 'origin/main' into richard-unifympt
Merge remote-tracking branch 'origin/main' into richard-unifympt
Merge remote-tracking branch 'origin/main' into richard-unifympt
simplify?
ugh compat
cleanup
Merge remote-tracking branch 'origin/main' into richard-unifympt
cleanup
tests
Merge remote-tracking branch 'origin/main' into richard-unifympt
more tests
Merge remote-tracking branch 'origin/main' into richard-unifympt
Merge remote-tracking branch 'origin/main' into richard-unifympt
simplify?
Merge branch 'main' into richard-unifympt
cleanup
Merge remote-tracking branch 'origin/main' into richard-unifympt
Merge remote-tracking branch 'origin/main' into richard-unifympt
Merge remote-tracking branch 'origin/main' into richard-unifympt
no more .mpt
remove all .mpt and lint
cleanup
local data path fixes
mpt re-add
re-add artifact
lint
Merge remote-tracking branch 'origin/main' into richard-unifympt
more cleanup
Merge remote-tracking branch 'origin/main' into richard-unifympt
diff cleanup
ftt
lint
fix error
Merge remote-tracking branch 'origin/main' into richard-unifympt
more tests
lint
Merge remote-tracking branch 'origin/main' into richard-unifympt
Merge remote-tracking branch 'origin/main' into richard-unifympt
checkpoint policy does save/load
lint
checkpoint moving
catcus
lint
Merge branch 'main' into richard-unifympt
fold-in
[pyright 4] Get pyright to pass on app_backend (#4478)
Merge remote-tracking branch 'origin/main' into richard-unifympt
Fix command, add space (#4456)
added space to --app:lib--tlsEmulation:off which makes it --app:lib
--tlsEmulation:off
now it runs
Rename HyperUpdateRule to ScheduleRule (#4483)
- rename HyperUpdateRule to ScheduleRule and apply to TrainerConfig via
target_path
- update recipes and teacher scheduling to use ScheduleRule
- report PPO stats using ppo_actor/ppo_critic hyperparam keys and update
tests
- not run (not requested)
---------
Co-authored-by: graphite-app[bot] <96075541+graphite-app[bot]@users.noreply.github.com>
Merge remote-tracking branch 'origin/main' into richard-unifympt
Fix supervisor teacher behavior and legacy BC mode (#4484)
- gate PPO actor during supervisor teacher phase
- fix supervisor/no-teacher behavior and add legacy BC (no gating, no
PPO resume)
- require supervisor policy URI for sliced_cloner_no_ppo
- not run (not requested)
---------
Co-authored-by: graphite-app[bot] <96075541+graphite-app[bot]@users.noreply.github.com>
Co-authored-by: Adam S <134907338+gustofied@users.noreply.github.com>
Minor fixes to the slstm triton kernel, causing failures for certain kernel sizes (#4492)
cleanup
Merge remote-tracking branch 'origin/main' into richard-unifympt
fold in
training environments and eval environments mismatched (#4487)
I ran a direct config comparison using the training entrypoint
(recipes/experiment/cogs_v_clips.train) with variants=["heart_chorus"]
and compared the eval suite
config it builds (difficulty standard + heart_chorus) for an overlapping
mission: hello_world.oxygen_bottleneck.
Findings:
- Compass is ON in both training and eval (global_obs.compass=True).
- Vibe count and change‑vibe settings match (152 vibes;
change_vibe.number_of_vibes=152).
- But the mission parameters differ between training and eval for the
same mission name:
- game.objects.carbon_extractor.max_uses: train 25 vs eval 100
- game.objects.oxygen_extractor.max_uses: train 5 vs eval 20
- game.objects.germanium_extractor.max_uses: train 5 vs eval 20
- game.objects.silicon_extractor.max_uses: train 120 vs eval 480
So the mismatch isn’t compass — it’s the mission definitions used by
training vs eval. Training uses base missions
(cogames.cogs_vs_clips.missions), while eval uses
integrated eval missions (cogames.cogs_vs_clips.evals.integrated_evals)
that have different extractor settings.
Also: the eval suite used by recipes/experiment/cogs_v_clips.train does
not include machina_1.open_world at all (it only evaluates the 7
HELLO_WORLD integrated
evals). So training can be creating hearts on easier missions while your
eval runs on machina_1 are a different environment entirely.
Relevant files:
- Compass default: packages/cogames/src/cogames/cogs_vs_clips/mission.py
- Training entrypoint + eval suite wiring:
recipes/experiment/cogs_v_clips.py
- Eval mission definitions:
packages/cogames/src/cogames/cogs_vs_clips/evals/integrated_evals.py
If you want true parity, we should align which mission templates eval
uses (and/or include machina_1.open_world in the eval suite). I can
patch this if you want —
tell me whether you prefer:
1. Eval suite uses the same mission templates as training (from
missions.py), or
2. Training uses the integrated eval mission definitions, or
3. Add machina_1.open_world to the eval suite.
ripping out
Merge remote-tracking branch 'origin/main' into richard-unifympt
simplify
fix and lint
choke1 parent 7d79b2e commit caed3d0
File tree
9 files changed
+33
-26
lines changed- recipes/experiment
- abes
- kickstart
- cvc
9 files changed
+33
-26
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
112 | 112 | | |
113 | 113 | | |
114 | 114 | | |
115 | | - | |
| 115 | + | |
116 | 116 | | |
117 | 117 | | |
118 | 118 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
150 | 150 | | |
151 | 151 | | |
152 | 152 | | |
153 | | - | |
| 153 | + | |
154 | 154 | | |
155 | 155 | | |
156 | 156 | | |
| |||
192 | 192 | | |
193 | 193 | | |
194 | 194 | | |
195 | | - | |
196 | | - | |
197 | | - | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
198 | 198 | | |
199 | | - | |
| 199 | + | |
200 | 200 | | |
201 | 201 | | |
202 | 202 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
113 | | - | |
| 113 | + | |
114 | 114 | | |
115 | 115 | | |
116 | 116 | | |
| |||
169 | 169 | | |
170 | 170 | | |
171 | 171 | | |
172 | | - | |
173 | | - | |
174 | | - | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
175 | 175 | | |
176 | | - | |
| 176 | + | |
177 | 177 | | |
178 | 178 | | |
179 | 179 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
114 | 114 | | |
115 | 115 | | |
116 | 116 | | |
117 | | - | |
| 117 | + | |
118 | 118 | | |
119 | 119 | | |
120 | 120 | | |
| |||
148 | 148 | | |
149 | 149 | | |
150 | 150 | | |
151 | | - | |
152 | | - | |
153 | | - | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
154 | 154 | | |
155 | | - | |
| 155 | + | |
156 | 156 | | |
157 | 157 | | |
158 | 158 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
132 | 132 | | |
133 | 133 | | |
134 | 134 | | |
135 | | - | |
136 | | - | |
137 | | - | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
138 | 138 | | |
139 | | - | |
| 139 | + | |
140 | 140 | | |
141 | 141 | | |
142 | 142 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
308 | 308 | | |
309 | 309 | | |
310 | 310 | | |
311 | | - | |
| 311 | + | |
312 | 312 | | |
313 | 313 | | |
314 | 314 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
112 | 112 | | |
113 | 113 | | |
114 | 114 | | |
115 | | - | |
| 115 | + | |
116 | 116 | | |
117 | 117 | | |
118 | 118 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
554 | 554 | | |
555 | 555 | | |
556 | 556 | | |
557 | | - | |
| 557 | + | |
558 | 558 | | |
559 | | - | |
| 559 | + | |
| 560 | + | |
| 561 | + | |
| 562 | + | |
| 563 | + | |
| 564 | + | |
| 565 | + | |
| 566 | + | |
560 | 567 | | |
561 | 568 | | |
562 | | - | |
| 569 | + | |
563 | 570 | | |
564 | 571 | | |
565 | 572 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
136 | 136 | | |
137 | 137 | | |
138 | 138 | | |
139 | | - | |
| 139 | + | |
140 | 140 | | |
141 | 141 | | |
142 | 142 | | |
| |||
0 commit comments