Restructure: descriptive tier and experiment names, paper/manuscript
- paper/pnas -> paper/manuscript (venue-neutral)
- configs/layer1 -> configs/inheritance, src/knowledge -> src/inheritance
(imported as `inheritance`), make layer1 -> make inheritance; layer2 alias dropped
- inheritance and trained-network bundles named after the manuscript figure
they feed (fig2_grounding_sweep, figS3_rebaselining, ...), or descriptively
where they feed none; configs keep their `experiment:` value so parquet
hashes are unchanged, only output.dir moves
- figure scripts, SI figure sources, notebooks, REPRODUCING.md, README and the
SI Methods/tables updated; make clean no longer deletes tracked manifests;
reproduce.sh hashes the s{seed}/ layouts too
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Y64o8FKP7rCuXzC48pxpMm
This commit is contained in:
parent
84124de143
commit
ab3dc10587
240 changed files with 477 additions and 476 deletions
40
Makefile
40
Makefile
|
|
@ -1,14 +1,14 @@
|
|||
# Layer 1 + Layer 1.5 automation. The uv venv (built from the committed uv.lock) is the
|
||||
# Repository automation (inheritance, neural and language-model tiers). The uv venv (built from the committed uv.lock) is the
|
||||
# reproducibility source of truth; every target runs inside it via `uv run`.
|
||||
|
||||
.PHONY: env env-neural env-mnist env-llm env-notebooks test layer1 layer2 neural mnist llm \
|
||||
.PHONY: env env-neural env-mnist env-llm env-notebooks test inheritance neural mnist llm \
|
||||
llm-epistasis llm-society llm-society-calib llm-society-calib-b llm-society-v2-smoke \
|
||||
figures paper-figures paper notebooks clean
|
||||
|
||||
env: ## build .venv from the committed lockfile
|
||||
uv sync --extra dev
|
||||
|
||||
env-neural: ## add the Layer 1.5 torch stack (GPU; Stage C onward)
|
||||
env-neural: ## add the torch stack for the trained-network tier (GPU)
|
||||
uv sync --extra dev --extra neural
|
||||
|
||||
env-mnist: ## add torchvision for the real-MNIST confirmation tier
|
||||
|
|
@ -17,19 +17,19 @@ env-mnist: ## add torchvision for the real-MNIST confirmation tier
|
|||
test: ## correctness tests + scientific-validation tests (the spine of trust)
|
||||
uv run pytest
|
||||
|
||||
layer1: ## run experiments E1-E6 + the learning-kernel bridge (analytic)
|
||||
for e in E1 E2 E3 E4 E5 E6 E7 E8 E9 E10 E11 E12 E12_nk E14 kernel_sharpen kernel_smooth; do uv run python -m knowledge.experiment configs/layer1/$$e.yaml; done
|
||||
inheritance: ## run every inheritance-model experiment (analytic; bitwise reproducible)
|
||||
for c in configs/inheritance/*.yaml; do uv run python -m inheritance.experiment "$$c"; done
|
||||
|
||||
neural: ## run Layer 1.5 synthetic neural experiments (excludes the MNIST/torchvision tiers)
|
||||
neural: ## run the synthetic trained-network experiments (excludes the MNIST/torchvision tiers)
|
||||
for c in configs/neural/*.yaml; do case "$$c" in *mnist*|*speciation_real*) ;; \
|
||||
*) uv run python -m neural.experiment "$$c" ;; esac; done
|
||||
|
||||
mnist: ## run the torchvision tiers: MNIST collapse + E13 real-weight speciation (needs env-mnist)
|
||||
uv run python -m neural.experiment configs/neural/mnist_collapse.yaml
|
||||
mnist: ## run the torchvision tiers: MNIST collapse + real-weight speciation (needs env-mnist)
|
||||
uv run python -m neural.experiment configs/neural/fig2_mnist_collapse.yaml
|
||||
uv run python -m neural.experiment configs/neural/speciation_real.yaml
|
||||
uv run python -m neural.experiment configs/neural/speciation_real_cliff.yaml
|
||||
uv run python -m neural.experiment configs/neural/speciation_real_emergent.yaml
|
||||
MPLBACKEND=Agg uv run python figures/mnist_montage.py # the asset paper Fig. 2B embeds
|
||||
MPLBACKEND=Agg uv run python figures/mnist_montage.py # the asset paper Fig. 2A embeds
|
||||
|
||||
env-llm: ## add the LLM stack for the Layer-2 prototype (GPU; transformers/peft)
|
||||
uv sync --extra dev --extra neural --extra llm
|
||||
|
|
@ -76,21 +76,17 @@ llm-seeds: ## multi-seed firm-up (heavy): merge x5, moe-hard x3, directe
|
|||
uv run python -m llm.experiment configs/llm/moe_hard_seeds.yaml
|
||||
uv run python -m llm.experiment configs/llm/directed_hard_seeds.yaml
|
||||
|
||||
layer2: neural ## alias: Layer 1.5 is the current Layer-2 deliverable (LLM rung deferred)
|
||||
|
||||
figures: ## regenerate per-experiment figures from committed results (pure; no re-simulation)
|
||||
for e in E1 E2 E3 E4 E5 E6; do MPLBACKEND=Agg uv run python figures/plot_$$e.py; done
|
||||
for p in figures/plot_*.py; do case "$$p" in */plot_E[1-6].py|*/_*) ;; \
|
||||
*) [ -e "$$p" ] && MPLBACKEND=Agg uv run python "$$p" ;; esac; done
|
||||
for p in figures/plot_*.py; do MPLBACKEND=Agg uv run python "$$p"; done
|
||||
|
||||
paper-figures: ## regenerate the manuscript figures (Fig. 1-7) and rebuild the PDF bodies
|
||||
MPLBACKEND=Agg uv run python paper/pnas/make_figs.py
|
||||
uv run python paper/pnas/build.py
|
||||
uv run python paper/pnas/build.py si
|
||||
paper-figures: ## regenerate the manuscript figures (Fig. 1-5) and rebuild the PDF bodies
|
||||
MPLBACKEND=Agg uv run python paper/manuscript/make_figs.py
|
||||
uv run python paper/manuscript/build.py
|
||||
uv run python paper/manuscript/build.py si
|
||||
|
||||
paper: paper-figures ## figures + compile both PDFs (needs tectonic)
|
||||
cd paper/pnas && tectonic main.tex && tectonic si.tex
|
||||
uv run python paper/pnas/build_lay_legends.py && cd paper/pnas && tectonic figure_legends_for_students.tex
|
||||
cd paper/manuscript && tectonic main.tex && tectonic si.tex
|
||||
uv run python paper/manuscript/build_lay_legends.py && cd paper/manuscript && tectonic figure_legends_for_students.tex
|
||||
|
||||
env-notebooks: ## add Jupyter for the walkthrough notebooks
|
||||
uv sync --extra dev --extra notebooks
|
||||
|
|
@ -99,6 +95,6 @@ notebooks: ## execute every notebook end-to-end (a reproduction check in
|
|||
for nb in notebooks/*.ipynb; do uv run jupyter nbconvert --to notebook --execute \
|
||||
--inplace --ExecutePreprocessor.timeout=1800 "$$nb"; done
|
||||
|
||||
clean: ## remove caches and generated results (keeps committed manifests)
|
||||
clean: ## remove caches and regenerable parquets (keeps committed manifests and figures)
|
||||
rm -rf .pytest_cache **/__pycache__
|
||||
find results -type f ! -name '.gitkeep' -delete 2>/dev/null || true
|
||||
find results -name 'results.parquet' -delete 2>/dev/null || true # tracked manifests/figures stay
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue