diff --git a/Makefile b/Makefile index 7ffbd04..f1f6c1a 100644 --- a/Makefile +++ b/Makefile @@ -7,11 +7,11 @@ DB := $(REPO_ROOT)/runs/state/cos-orch.sqlite RESULT_ROOT := $(REPO_ROOT)/runs/results SCRATCH_ROOT := $(REPO_ROOT)/runs/scratch -FIG1_M005 := $(LEGACY_ROOT)/examples/track1_figure1_paper_M_0_05.json -FIG1_M025 := $(LEGACY_ROOT)/examples/track1_figure1_paper_M_0_25.json -FIG1_M05 := $(LEGACY_ROOT)/examples/track1_figure1_paper_M_0_5.json -FIG1_M10 := $(LEGACY_ROOT)/examples/track1_figure1_paper_M_1_0.json -FIG1_M100 := $(LEGACY_ROOT)/examples/track1_figure1_paper_M_10_0.json +FIG1_M005 := $(REPO_ROOT)/config/track1_figure1_paper_M_0_05.json +FIG1_M025 := $(REPO_ROOT)/config/track1_figure1_paper_M_0_25.json +FIG1_M05 := $(REPO_ROOT)/config/track1_figure1_paper_M_0_5.json +FIG1_M10 := $(REPO_ROOT)/config/track1_figure1_paper_M_1_0.json +FIG1_M100 := $(REPO_ROOT)/config/track1_figure1_paper_M_10_0.json .PHONY: help init doctor list-jobs run-one run-loop run-loop-one collate-figure1 \ submit-figure1-m005 submit-figure1-m025 submit-figure1-m05 submit-figure1-m10 submit-figure1-m100 \ diff --git a/README.md b/README.md index abcf74a..3770553 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ plane is now local to `renunney`. - a clean git repo, - a stable working directory layout, - a local orchestration CLI and library, +- local paper-scale Figure 1 submission configs, - a Makefile for common tasks, - migration notes for pulling code into this repo in stages. diff --git a/config/README.md b/config/README.md index 99788a9..9d3683e 100644 --- a/config/README.md +++ b/config/README.md @@ -6,5 +6,6 @@ Configuration templates and future environment-specific settings for: - result roots - scratch roots - host-specific worker defaults +- paper-scale Figure 1 submission configs This directory is intentionally small for now. diff --git a/config/track1_figure1_paper_M_0_05.json b/config/track1_figure1_paper_M_0_05.json new file mode 100644 index 0000000..ed0590a --- /dev/null +++ b/config/track1_figure1_paper_M_0_05.json @@ -0,0 +1,17 @@ +{ + "mode": "loci_regression", + "K": 5000, + "N0": 5000, + "n": 1, + "u": 5e-06, + "R": 10.0, + "T": 500, + "epochs": 8, + "p": 0.5, + "runs": 20, + "jobs": 8, + "t_values": [1, 2, 4, 6, 8, 10, 15, 20, 30, 40, 50, 75, 100, 125, 150, 175, 200, 250, 300, 350, 400, 450, 500], + "loci_values": [1, 2, 3, 4, 5, 6, 7], + "seed": 10, + "cache_path": "/tmp/track1-figure1-paper-m005-cache.json" +} diff --git a/config/track1_figure1_paper_M_0_25.json b/config/track1_figure1_paper_M_0_25.json new file mode 100644 index 0000000..10d56f8 --- /dev/null +++ b/config/track1_figure1_paper_M_0_25.json @@ -0,0 +1,17 @@ +{ + "mode": "loci_regression", + "K": 5000, + "N0": 5000, + "n": 1, + "u": 2.5e-05, + "R": 10.0, + "T": 500, + "epochs": 8, + "p": 0.5, + "runs": 20, + "jobs": 8, + "t_values": [1, 2, 4, 6, 8, 10, 15, 20, 30, 40, 50, 75, 100, 125, 150, 175, 200, 250, 300, 350, 400, 450, 500], + "loci_values": [1, 2, 3, 4, 5, 6, 7], + "seed": 10, + "cache_path": "/tmp/track1-figure1-paper-m025-cache.json" +} diff --git a/config/track1_figure1_paper_M_0_5.json b/config/track1_figure1_paper_M_0_5.json new file mode 100644 index 0000000..8f0764b --- /dev/null +++ b/config/track1_figure1_paper_M_0_5.json @@ -0,0 +1,17 @@ +{ + "mode": "loci_regression", + "K": 5000, + "N0": 5000, + "n": 1, + "u": 5e-05, + "R": 10.0, + "T": 500, + "epochs": 8, + "p": 0.5, + "runs": 20, + "jobs": 8, + "t_values": [1, 2, 4, 6, 8, 10, 15, 20, 30, 40, 50, 75, 100, 125, 150, 175, 200, 250, 300, 350, 400, 450, 500], + "loci_values": [1, 2, 3, 4, 5, 6, 7], + "seed": 10, + "cache_path": "/tmp/track1-figure1-paper-m05-cache.json" +} diff --git a/config/track1_figure1_paper_M_10_0.json b/config/track1_figure1_paper_M_10_0.json new file mode 100644 index 0000000..f847927 --- /dev/null +++ b/config/track1_figure1_paper_M_10_0.json @@ -0,0 +1,17 @@ +{ + "mode": "loci_regression", + "K": 5000, + "N0": 5000, + "n": 1, + "u": 0.001, + "R": 10.0, + "T": 500, + "epochs": 8, + "p": 0.5, + "runs": 20, + "jobs": 8, + "t_values": [1, 2, 4, 6, 8, 10, 15, 20, 30, 40, 50, 75, 100, 125, 150, 175, 200, 250, 300, 350, 400, 450, 500], + "loci_values": [1, 2, 3, 4, 5, 6, 7], + "seed": 10, + "cache_path": "/tmp/track1-figure1-paper-m100-cache.json" +} diff --git a/config/track1_figure1_paper_M_1_0.json b/config/track1_figure1_paper_M_1_0.json new file mode 100644 index 0000000..ec9d032 --- /dev/null +++ b/config/track1_figure1_paper_M_1_0.json @@ -0,0 +1,17 @@ +{ + "mode": "loci_regression", + "K": 5000, + "N0": 5000, + "n": 1, + "u": 0.0001, + "R": 10.0, + "T": 500, + "epochs": 8, + "p": 0.5, + "runs": 20, + "jobs": 8, + "t_values": [1, 2, 4, 6, 8, 10, 15, 20, 30, 40, 50, 75, 100, 125, 150, 175, 200, 250, 300, 350, 400, 450, 500], + "loci_values": [1, 2, 3, 4, 5, 6, 7], + "seed": 10, + "cache_path": "/tmp/track1-figure1-paper-m10-cache.json" +} diff --git a/docs/MIGRATION.md b/docs/MIGRATION.md index d7be0b2..4992447 100644 --- a/docs/MIGRATION.md +++ b/docs/MIGRATION.md @@ -23,15 +23,16 @@ Operational code still lives in: 1. Orchestration control plane has been migrated locally: - `src/renunney/orchestration.py` - `scripts/run_orchestration.py` -2. Keep the Track 1 simulation backend in the legacy path until real multi-host runs are stable. -3. Migrate Track 1 runner and API next: +2. Paper-scale Figure 1 submission configs have been copied locally into `config/`. +3. Keep the Track 1 simulation backend in the legacy path until real multi-host runs are stable. +4. Migrate Track 1 runner and API next: - `python/run_track1.py` - `python/track1_api.py` -4. Migrate the Track 1 simulation core after the runner path is stable: +5. Migrate the Track 1 simulation core after the runner path is stable: - `python/track1_reference.py` - `python/track1_threshold.py` - `python/track1_analysis.py` -5. Migrate docs and example configs last, after path references are updated. +6. Migrate docs and example configs last, after path references are updated. ## Constraint diff --git a/docs/WORKFLOW.md b/docs/WORKFLOW.md index 7abcf1b..b109386 100644 --- a/docs/WORKFLOW.md +++ b/docs/WORKFLOW.md @@ -42,4 +42,5 @@ make status The Makefile now drives the local orchestration code in `renunney`, while the simulation backend is still imported from the legacy `cost_of_substitution` -directory. +directory. The paper-scale Figure 1 configs used for submission are now local +to `renunney/config`.