Commit 40c88f1
## Summary
- Removes the deprecated `EvaluationConfig.launch_with_ray` dispatch
path from the eval tree. Net **−343 LOC** across 11 files.
- No behavior change on production call-sites (they already defaulted
`launch_with_ray=False`). `tests/evals/test_lm_eval.py` still runs
in-process.
- Part of #4453 (Migrate all supported Marin code off Ray).
## What's removed
- `Evaluator.launch_evaluate_with_ray` abstract method + the
module-level helper that built a v1 `JobRequest` and called
`fray.v1.cluster.current_cluster().launch(...)`.
- Per-evaluator `launch_evaluate_with_ray` methods across all six
evaluator files.
- Dead `Dependency` dataclass and dead `get_runtime_env` methods on the
two lm-eval evaluators.
- `EvaluationConfig.launch_with_ray: bool` field.
- `_to_v1_resource_config` v2→v1 adapter in `run.py`.
- All `fray.v1.*` imports in `lib/marin/src/marin/evaluation/`. `rg
'fray\.v1' lib/marin/src/marin/evaluation experiments/evals tests/evals`
→ 0 matches.
- Intermediate `LevanterTpuEvaluator` base class (collapsed into
`LevanterLmEvalEvaluator`).
## Remaining `fray.v1` surfaces
Orthogonal to evals, tracked in the #4453 follow-up PR stack — see the
analysis doc for the full decomposition.
## Test plan
- [x] \`./infra/pre-commit.py --all-files\` — green (ruff / black /
pyrefly / license headers)
- [x] \`uv run --package marin --extra cpu pytest
tests/test_evaluator_utils.py\` — 1 passed
- [x] \`uv run --package marin --extra cpu pytest
tests/test_dry_run.py\` — 74 passed, 77 skipped (infra-gated, unrelated)
- [x] \`pytest tests/evals/test_lm_eval.py --collect-only -q -m tpu_ci\`
— 2 collected, imports resolve without \`launch_with_ray\`
- [x] **TPU smoke on v5p-8 us-east5-a:** \`pytest
tests/evals/test_lm_eval.py::test_lm_eval_harness -v -m tpu_ci\` —
**PASSED in 196.72s** (matches the \`eval_testing.md:192\` baseline
exactly). vLLM cold-start + gsm8k × 1 + GCS upload.
\`test_lm_eval_harness_levanter\` is skipped: known broken upstream on
\`transformers\` API drift, pre-existing and not touched by this PR.
---------
Co-authored-by: Kevin Li <kevinli020508@gmail.com>
Co-authored-by: Romain Yon <1596570+yonromai@users.noreply.github.com>
1 parent e233ba1 commit 40c88f1
11 files changed
Lines changed: 54 additions & 403 deletions
File tree
- experiments/evals
- lib/marin/src/marin/evaluation
- evaluators
- tests/evals
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
| |||
406 | 407 | | |
407 | 408 | | |
408 | 409 | | |
409 | | - | |
| 410 | + | |
410 | 411 | | |
411 | 412 | | |
412 | 413 | | |
| |||
440 | 441 | | |
441 | 442 | | |
442 | 443 | | |
443 | | - | |
444 | | - | |
| 444 | + | |
| 445 | + | |
445 | 446 | | |
446 | 447 | | |
447 | 448 | | |
448 | | - | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
449 | 455 | | |
450 | 456 | | |
451 | 457 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
| 37 | + | |
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| |||
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | 74 | | |
80 | 75 | | |
81 | 76 | | |
| |||
Lines changed: 2 additions & 34 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | | - | |
36 | 35 | | |
37 | 36 | | |
38 | 37 | | |
39 | | - | |
| 38 | + | |
40 | 39 | | |
41 | 40 | | |
42 | 41 | | |
| |||
670 | 669 | | |
671 | 670 | | |
672 | 671 | | |
673 | | - | |
| 672 | + | |
674 | 673 | | |
675 | 674 | | |
676 | 675 | | |
| |||
1058 | 1057 | | |
1059 | 1058 | | |
1060 | 1059 | | |
1061 | | - | |
1062 | | - | |
1063 | | - | |
1064 | | - | |
1065 | | - | |
1066 | | - | |
1067 | | - | |
1068 | | - | |
1069 | | - | |
1070 | | - | |
1071 | | - | |
1072 | | - | |
1073 | | - | |
1074 | | - | |
1075 | | - | |
1076 | | - | |
1077 | | - | |
1078 | | - | |
1079 | | - | |
1080 | | - | |
1081 | | - | |
1082 | | - | |
1083 | | - | |
1084 | | - | |
1085 | | - | |
1086 | | - | |
1087 | | - | |
1088 | | - | |
1089 | | - | |
1090 | | - | |
1091 | | - | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | 5 | | |
7 | 6 | | |
8 | 7 | | |
9 | | - | |
10 | | - | |
11 | 8 | | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | 9 | | |
29 | 10 | | |
30 | 11 | | |
| |||
57 | 38 | | |
58 | 39 | | |
59 | 40 | | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | 41 | | |
84 | 42 | | |
85 | 43 | | |
| |||
91 | 49 | | |
92 | 50 | | |
93 | 51 | | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | | - | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | | - | |
120 | | - | |
121 | | - | |
122 | | - | |
123 | | - | |
124 | | - | |
125 | | - | |
126 | | - | |
127 | | - | |
128 | | - | |
129 | | - | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | | - | |
136 | | - | |
137 | | - | |
138 | | - | |
139 | | - | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | | - | |
147 | | - | |
148 | | - | |
149 | | - | |
150 | | - | |
Lines changed: 21 additions & 71 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
28 | 27 | | |
29 | 28 | | |
30 | 29 | | |
31 | | - | |
| 30 | + | |
32 | 31 | | |
33 | | - | |
| 32 | + | |
34 | 33 | | |
35 | 34 | | |
36 | 35 | | |
| |||
45 | 44 | | |
46 | 45 | | |
47 | 46 | | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
48 | 65 | | |
49 | 66 | | |
50 | 67 | | |
| |||
68 | 85 | | |
69 | 86 | | |
70 | 87 | | |
71 | | - | |
| 88 | + | |
72 | 89 | | |
73 | 90 | | |
74 | 91 | | |
| |||
261 | 278 | | |
262 | 279 | | |
263 | 280 | | |
264 | | - | |
265 | | - | |
266 | | - | |
267 | | - | |
268 | | - | |
269 | | - | |
270 | | - | |
271 | | - | |
272 | | - | |
273 | | - | |
274 | | - | |
275 | | - | |
276 | | - | |
277 | | - | |
278 | | - | |
279 | | - | |
280 | | - | |
281 | | - | |
282 | | - | |
283 | | - | |
284 | | - | |
285 | | - | |
286 | | - | |
287 | | - | |
288 | | - | |
289 | | - | |
290 | | - | |
291 | | - | |
292 | | - | |
293 | | - | |
294 | | - | |
295 | | - | |
296 | | - | |
297 | | - | |
298 | | - | |
299 | | - | |
300 | | - | |
301 | | - | |
302 | | - | |
303 | | - | |
304 | | - | |
305 | | - | |
306 | | - | |
307 | | - | |
308 | | - | |
309 | | - | |
310 | | - | |
311 | | - | |
312 | | - | |
313 | | - | |
314 | | - | |
315 | | - | |
316 | | - | |
317 | | - | |
318 | | - | |
319 | | - | |
320 | | - | |
321 | | - | |
322 | | - | |
323 | | - | |
324 | | - | |
325 | | - | |
326 | | - | |
327 | | - | |
328 | | - | |
329 | | - | |
330 | | - | |
331 | 281 | | |
332 | 282 | | |
333 | 283 | | |
| |||
Lines changed: 9 additions & 18 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
19 | | - | |
20 | | - | |
| 18 | + | |
21 | 19 | | |
22 | 20 | | |
23 | 21 | | |
24 | 22 | | |
25 | | - | |
26 | | - | |
| 23 | + | |
| 24 | + | |
27 | 25 | | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
41 | 32 | | |
42 | 33 | | |
43 | 34 | | |
| |||
0 commit comments