Skip to content

Commit 8e90b0c

Browse files
2-meancursoragent
andcommitted
refactor: Gate 6 batch 5 remove strategies spectral import facades
Delete graphfl_lab/strategies/spectral star-import wrappers; canonical strategy code remains under strategies/graphfl. spectral_fl shim unchanged. Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent a81d702 commit 8e90b0c

16 files changed

Lines changed: 8 additions & 50 deletions

File tree

MIGRATION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ python run_experiment.py --track cora ...
2525
During deprecation, old names remain available where documented:
2626

2727
```text
28-
spectral_fl
28+
spectral_fl (shim; `strategies.spectral` import path removed in Gate 6 batch 5)
2929
configs/general/...
3030
result_general_* (readers only; new runs no longer write mirrors)
3131
general_suite_* (readers only; new runs no longer write mirrors)

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,6 @@ New code uses `vision`, `graphfl`, `graph_filtered_*`.
332332
| Old name | Role |
333333
|---|---|
334334
| `spectral_fl` | old package import shim |
335-
| `graphfl_lab/strategies/spectral/` | `graphfl_lab/strategies/graphfl/` wrapper |
336335
| `spectral_filtered_*`, `spectral_filter_strength` | config/result compatibility alias |
337336
| `general_suite_*`, `result_general_*` | historical output filenames (readers only; new runs use vision names) |
338337

docs/maintenance/cleanup-status.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ disagree, rerun the relevant gate check and update this file from the result.
1010
| Field | Value |
1111
|---|---|
1212
| current_gate | Gate 4c complete on `main`; Gate 6 batches 1–3 in progress on `main` |
13-
| status | PR #2 merged; nightly 26288800411 green; Gate 6 batches 2–4 landed; `graphfl_lab/strategies/spectral/` and `spectral_fl` shim still present per `gate-6-prep.md` |
13+
| status | PR #2 merged; nightly 26288800411 green; Gate 6 batches 2–5 landed; `spectral_fl` shim and root `general_*` CLI facades remain per `gate-6-prep.md` |
1414
| owner | codex |
1515
| started_at | 2026-05-21 |
1616
| last_verified | see `docs/maintenance/last_gate_check.json` |
17-
| next_step | Gate 6 batch 5: remove `graphfl_lab/strategies/spectral/` wrappers; then `spectral_fl` shim and root `general_*` CLI facades; re-run CI/nightly after batch 5 |
17+
| next_step | Confirm CI green on batch 5 commit; then batch 6 (`spectral_fl` shim) only after grep shows no remaining imports; batch 7 legacy CLI tokens last |
1818

1919
Only one Gate branch should be active at a time. In short: use a single Gate branch.
2020
If parallel work is
@@ -270,6 +270,7 @@ result-schema contracts.
270270
| 2026-05-22 | Gate 6 batch 2: new suite/vision runs should stop duplicating `general_*` artifact files while readers still resolve legacy paths. | Drop `general_suite_*` and `result_general_*` writers; add `scripts/dev/migrate_serialized_objects.py` for serialized inventory. |
271271
| 2026-05-22 | Gate 6 batch 3: root `run_general_*` and `plot_general_*` / `merge_general_*` / `deep_dive_general` wrappers only re-exported vision CLIs after C5. | Delete wrappers; compile canonical `run_vision_*` in CI/nightly; drop `run_general_experiment` from `gate-check 4b` contract. |
272272
| 2026-05-22 | Gate 6 batch 4: `graphfl_lab/experiments/general/` and `suites/general/` were star-import facades with no remaining in-repo consumers after batch 3. | Delete import-path wrappers; keep root `general_*` CLI shims and `strategies/spectral/` for batch 5+. |
273+
| 2026-05-22 | Gate 6 batch 5: `graphfl_lab/strategies/spectral/` mirrored `strategies/graphfl` with no in-repo Python imports; spectral math stays under `graph/operators` and `graphfl` modules. | Delete strategy import facades; use `graphfl_lab.strategies.graphfl` (or `spectral_fl.strategies.graphfl` via shim until batch 6). |
273274

274275
## Gate 4c Local Readiness
275276

@@ -280,7 +281,7 @@ present: scripts/dev/golden.py + tests/dev/test_golden.py + tests/golden/README.
280281
local pass: python scripts/dev/run.py gate-check 4c
281282
local pass: python scripts/dev/run.py gate-check 5d-prep
282283
Gate 6 entry: pragmatic policy (4c + merge CI green; optional 1 more green before first deletion)
283-
Gate 6 hard removal: batches 2–4 done; batches 5–8 remain — see docs/maintenance/gate-6-prep.md
284+
Gate 6 hard removal: batches 2–5 done; batches 6–8 remain — see docs/maintenance/gate-6-prep.md
284285
```
285286

286287
## Closure Policy

docs/maintenance/gate-6-prep.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ replace with the recommended check above unless you explicitly want a week-long
3535
2. [x] Remove compatibility **writers** of duplicate artifacts (`general_suite_*`, `result_general_*` mirrors); readers still accept legacy paths.
3636
3. [x] Remove `run_general_*` root wrappers and `plot_general_*` / `merge_general_*` / `deep_dive_general` script wrappers.
3737
4. [x] Remove `graphfl_lab/experiments/general/` and `graphfl_lab/experiments/suites/general/` import facades.
38-
5. Remove `graphfl_lab/strategies/spectral/` wrappers (keep real spectral math names in operators).
38+
5. [x] Remove `graphfl_lab/strategies/spectral/` wrappers (keep real spectral math names in operators).
3939
6. Remove `spectral_fl` package shim last, after grep shows no remaining imports outside tests explicitly checking deprecation.
4040
7. Remove legacy CLI choices (`spectral_filtered_*` inputs) and old suite token spellings only after suite/history policy is frozen.
4141
8. Update `docs/maintenance/cleanup-status.md` to `closed` and link from `docs/removed-materials.md`.

docs/maintenance/last_gate_check.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"gate": "5d-prep",
33
"pass": true,
44
"failed_checks": [],
5-
"verified_at": "2026-05-22T13:06:11.020488+00:00",
6-
"commit_sha": "a0ccd8d3a882a6b78946b058112df32582f30747"
5+
"verified_at": "2026-05-22T13:09:27.027433+00:00",
6+
"commit_sha": "a81d70286aa817c3fcd012dc30a9ae263386ef62"
77
}

docs/structure.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ graphfl_lab/spectral_diagnostics.py
9393
graphfl_lab/strategy.py
9494
graphfl_lab/suite_stats.py
9595
graphfl_lab/update_graph.py
96-
graphfl_lab/strategies/spectral/
9796
graphfl_lab/experiments/suite.py
9897
graphfl_lab/experiments/stress_grid.py
9998
graphfl_lab/experiments/client_count_sweep.py
@@ -109,7 +108,6 @@ run_vision_*.py (canonical entrypoints; `run_general_*` removed Gate 6 batch 3)
109108
| `graphfl_lab/experiments/` | orchestration, subprocesses, metadata, output files | graph math, strategy internals |
110109
| `graphfl_lab/graph/` | relation graph construction | Flower strategies, experiment runners |
111110
| `graphfl_lab/strategies/graphfl/` | server-side aggregation behavior | config paths, suite output layouts |
112-
| `graphfl_lab/strategies/spectral/` | compatibility wrapper | new logic |
113111
| `graphfl_lab/strategies/baselines/` | baseline strategies, tracing helpers | graph builder internals |
114112
| `graphfl_lab/designs/` | method composition metadata | experiment execution |
115113
| `graphfl_lab/lifecycle/` | contracts, traces, state store, side-effect-free diagnostics | runtime graph builders |

graphfl_lab/strategies/spectral/__init__.py

Lines changed: 0 additions & 7 deletions
This file was deleted.

graphfl_lab/strategies/spectral/aggregation.py

Lines changed: 0 additions & 3 deletions
This file was deleted.

graphfl_lab/strategies/spectral/config.py

Lines changed: 0 additions & 3 deletions
This file was deleted.

graphfl_lab/strategies/spectral/diagnostics.py

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)