Commit a8d6ad8
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
choke
simplify submission zip creation
use policy_spec for submission zips
tighten checkpoint io helpers
shorten checkpoint arg help
inline checkpoint policy helpers
restore policy spec docstring
validate checkpoint data_path before download
require checkpoint directory URIs
expand policy spec s3 docstring1 parent 7ed4f29 commit a8d6ad8
File tree
4 files changed
+25
-23
lines changed- metta/rl
- loss
- packages
- cogames/scripts
- mettagrid/python/src/mettagrid/util/uri_resolvers
4 files changed
+25
-23
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
148 | 148 | | |
149 | 149 | | |
150 | 150 | | |
| 151 | + | |
| 152 | + | |
151 | 153 | | |
152 | 154 | | |
153 | 155 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
11 | 10 | | |
12 | 11 | | |
13 | 12 | | |
| |||
118 | 117 | | |
119 | 118 | | |
120 | 119 | | |
121 | | - | |
122 | | - | |
123 | | - | |
124 | | - | |
125 | | - | |
126 | | - | |
127 | | - | |
128 | | - | |
129 | | - | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| 36 | + | |
36 | 37 | | |
37 | 38 | | |
38 | 39 | | |
| |||
85 | 86 | | |
86 | 87 | | |
87 | 88 | | |
88 | | - | |
89 | | - | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
90 | 93 | | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
95 | 101 | | |
96 | | - | |
97 | | - | |
| 102 | + | |
98 | 103 | | |
99 | 104 | | |
100 | 105 | | |
| |||
Lines changed: 7 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
5 | 7 | | |
6 | 8 | | |
7 | 9 | | |
8 | 10 | | |
9 | 11 | | |
10 | 12 | | |
11 | | - | |
| 13 | + | |
12 | 14 | | |
13 | 15 | | |
14 | | - | |
| 16 | + | |
15 | 17 | | |
16 | 18 | | |
17 | 19 | | |
18 | 20 | | |
19 | 21 | | |
20 | 22 | | |
21 | 23 | | |
22 | | - | |
23 | | - | |
| 24 | + | |
| 25 | + | |
24 | 26 | | |
25 | 27 | | |
26 | | - | |
| 28 | + | |
27 | 29 | | |
28 | 30 | | |
29 | 31 | | |
| |||
0 commit comments