version 2

michielkallenberg · michielkallenberg · commit d2679f9e4b35 · 2026-07-09T15:33:02.000+02:00
diff --git a/cybench/runs/analysis/build_global_insights_dashboard.py b/cybench/runs/analysis/build_global_insights_dashboard.py
@@ -64,7 +64,7 @@ def main() -> int:
         default=Path("/lustre/backup/SHARED/AIN/agml/CY-Bench-dashboard"),
         help="GitHub Pages clone root (used when --dest is omitted)",
     )
-    parser.add_argument("--version", type=int, default=3, help="Batch version tag (default: 3)")
+    parser.add_argument("--version", type=int, default=2, help="Batch version tag (default: 2)")
     args = parser.parse_args()
 
     dest = args.dest or (args.publish_root / "insights.html")
diff --git a/cybench/runs/analysis/build_model_family_radar_dashboard.py b/cybench/runs/analysis/build_model_family_radar_dashboard.py
@@ -66,7 +66,7 @@ def main() -> int:
         default=Path("/lustre/backup/SHARED/AIN/agml/CY-Bench-dashboard"),
         help="GitHub Pages clone root (used when --dest is omitted)",
     )
-    parser.add_argument("--version", type=int, default=3, help="Batch version tag (default: 3)")
+    parser.add_argument("--version", type=int, default=2, help="Batch version tag (default: 2)")
     args = parser.parse_args()
 
     dest = args.dest or (args.publish_root / "model_families.html")
diff --git a/cybench/runs/analysis/country_significance_tests.py b/cybench/runs/analysis/country_significance_tests.py
@@ -5,7 +5,7 @@
 
     poetry run python cybench/runs/analysis/country_significance_tests.py \\
         --output-root /lustre/backup/SHARED/AIN/agml/output \\
-        --version 3 \\
+        --version 2 \\
         --horizon eos \\
         --latex-table ai_bootstrap_table.tex
 """
@@ -36,7 +36,7 @@ def main() -> int:
         default=Path("/lustre/backup/SHARED/AIN/agml/output"),
         help="Root containing paper_walk_forward_* collect directories",
     )
-    parser.add_argument("--version", type=int, default=3, help="Collect batch version tag")
+    parser.add_argument("--version", type=int, default=2, help="Collect batch version tag")
     parser.add_argument("--horizon", default="eos", help="Batch horizon slug (default: eos)")
     parser.add_argument(
         "--crops",
diff --git a/cybench/runs/analysis/dashboard_targets.yaml b/cybench/runs/analysis/dashboard_targets.yaml
@@ -9,7 +9,7 @@
 # Optional: uncomment ``include`` to pin a subset (also used by --mode planned).
 
 defaults:
-  version: 3
+  version: 2
   output_root: /lustre/backup/SHARED/AIN/agml/output
   repo_root: /lustre/backup/SHARED/AIN/agml/AgML-CY-Bench-AAAI
   publish_root: /lustre/backup/SHARED/AIN/agml/CY-Bench-dashboard
diff --git a/cybench/runs/analysis/export_family_table_latex.py b/cybench/runs/analysis/export_family_table_latex.py
@@ -6,7 +6,7 @@
     poetry run python cybench/runs/analysis/export_family_table_latex.py \\
         --output-root /lustre/backup/SHARED/AIN/agml/output \\
         --horizon eos \\
-        --version 3 \\
+        --version 2 \\
         -o family_table.tex
 """
 
@@ -30,7 +30,7 @@ def main() -> int:
         default=Path("/lustre/backup/SHARED/AIN/agml/output"),
         help="Root containing paper_walk_forward_* collect directories",
     )
-    parser.add_argument("--version", type=int, default=3, help="Collect batch version tag")
+    parser.add_argument("--version", type=int, default=2, help="Collect batch version tag")
     parser.add_argument("--horizon", default="eos", help="Batch horizon slug (default: eos)")
     parser.add_argument(
         "--crops",
diff --git a/cybench/runs/analysis/generate_collect_manifest.py b/cybench/runs/analysis/generate_collect_manifest.py
@@ -92,7 +92,7 @@ def main() -> int:
         "--version",
         type=int,
         metavar="N",
-        help="Limit to batch version suffix (e.g. 3 for baselines_DE_eos_v3)",
+        help="Limit to batch version suffix (e.g. 2 for baselines_DE_eos_v2)",
     )
     parser.add_argument(
         "--plot",
diff --git a/cybench/runs/analysis/global_insights_lib.py b/cybench/runs/analysis/global_insights_lib.py
@@ -132,7 +132,7 @@ def dashboard_href_for_paper_dir(paper_dir_name: str) -> str | None:
     return f"{slug}/dashboard.html"
 
 
-def build_dashboard_hrefs(output_root: Path, *, version: int = 1) -> dict[str, dict[str, str]]:
+def build_dashboard_hrefs(output_root: Path, *, version: int = 2) -> dict[str, dict[str, str]]:
     """Map CY-Bench country code -> horizon (``eos``/``mid``) -> dashboard HTML href."""
     hrefs: dict[str, dict[str, str]] = {}
     for path in discover_summary_tables(output_root, version=version):
@@ -146,7 +146,7 @@ def build_dashboard_hrefs(output_root: Path, *, version: int = 1) -> dict[str, d
     return hrefs
 
 
-def discover_summary_tables(output_root: Path, *, version: int = 1) -> list[Path]:
+def discover_summary_tables(output_root: Path, *, version: int = 2) -> list[Path]:
     """Return walk_forward_summary.csv paths under paper_walk_forward_* dirs."""
     if not output_root.is_dir():
         return []
@@ -1289,7 +1289,7 @@ def build_crop_comparison_payload(df: pd.DataFrame) -> dict[str, dict[str, Any]]
     return out
 
 
-def build_insights_payload(output_root: Path, *, version: int = 1) -> dict[str, Any]:
+def build_insights_payload(output_root: Path, *, version: int = 2) -> dict[str, Any]:
     """Build JSON-serializable payload for the global insights dashboard."""
     paths = discover_summary_tables(output_root, version=version)
     df = load_summary_frame(paths)
diff --git a/cybench/runs/analysis/model_family_radar_lib.py b/cybench/runs/analysis/model_family_radar_lib.py
@@ -990,7 +990,7 @@ def build_paper_family_table_latex(
 def build_radar_payload(
     output_root: Path,
     *,
-    version: int = 1,
+    version: int = 2,
     representatives: dict[str, str] | None = None,
 ) -> dict[str, Any]:
     """JSON payload for the model-family radar dashboard."""
diff --git a/cybench/runs/analysis/orchestrate_dashboard_publish.py b/cybench/runs/analysis/orchestrate_dashboard_publish.py
@@ -122,7 +122,7 @@ def main(argv: list[str] | None = None) -> int:
         "--version",
         type=int,
         metavar="N",
-        help="Limit to batch version suffix (e.g. 3 for baselines_DE_eos_v3)",
+        help="Limit to batch version suffix (e.g. 2 for baselines_DE_eos_v2)",
     )
     parser.add_argument(
         "--stages",
diff --git a/cybench/runs/analysis/publish_pipeline_lib.py b/cybench/runs/analysis/publish_pipeline_lib.py
@@ -56,7 +56,7 @@
 
 @dataclass(frozen=True)
 class PipelineDefaults:
-    version: int = 3
+    version: int = 2
     output_root: Path = Path("/lustre/backup/SHARED/AIN/agml/output")
     repo_root: Path = Path("/lustre/backup/SHARED/AIN/agml/AgML-CY-Bench-AAAI")
     publish_root: Path = Path("/lustre/backup/SHARED/AIN/agml/CY-Bench-dashboard")
@@ -67,7 +67,7 @@ class PipelineDefaults:
 class PublishTarget:
     country: str
     batch_horizon: str  # eos | mid | qtr (batch folder suffix)
-    version: int = 3
+    version: int = 2
     output_root: Path = field(default_factory=lambda: PipelineDefaults().output_root)
     repo_root: Path = field(default_factory=lambda: PipelineDefaults().repo_root)
     publish_root: Path = field(default_factory=lambda: PipelineDefaults().publish_root)
diff --git a/cybench/runs/analysis/refresh_dashboard_views.py b/cybench/runs/analysis/refresh_dashboard_views.py
@@ -76,7 +76,7 @@ def main() -> int:
     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument("--output-root", type=Path, required=True)
     parser.add_argument("--publish-root", type=Path, required=True)
-    parser.add_argument("--version", type=int, default=3, help="Batch version (default: 3)")
+    parser.add_argument("--version", type=int, default=2, help="Batch version (default: 2)")
     parser.add_argument("--country", action="append", dest="countries", metavar="CC")
     parser.add_argument("--dry-run", action="store_true")
     args = parser.parse_args()
diff --git a/cybench/runs/analysis/report_model_horizons.py b/cybench/runs/analysis/report_model_horizons.py
@@ -95,7 +95,7 @@ def main() -> int:
         type=Path,
         default=Path("/lustre/backup/SHARED/AIN/agml/output"),
     )
-    parser.add_argument("--version", type=int, default=3)
+    parser.add_argument("--version", type=int, default=2)
     parser.add_argument("--crop", help="Optional crop filter (maize, wheat, ...)")
     parser.add_argument(
         "--min-sample-ratio",
diff --git a/cybench/runs/slurm/submit_collect.sh b/cybench/runs/slurm/submit_collect.sh
@@ -20,7 +20,7 @@ Manifest and collect job options (forwarded to generate_collect_manifest.py):
   --mode ready|all-available|planned
   --country CC      Repeatable
   --horizon eos|mid|qtr|early Repeatable
-  --version N       Batch version suffix (e.g. 3 for baselines_DE_eos_v3)
+  --version N       Batch version suffix (e.g. 2 for baselines_DE_eos_v2)
   --plot            Dashboard drill-down PNGs (scatter, temporal; maps are dynamic)
   --no-plot         Metrics + preds + compare_models.html only (default)
 

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ def main() -> int:`
`64`	`64`	`default=Path("/lustre/backup/SHARED/AIN/agml/CY-Bench-dashboard"),`
`65`	`65`	`help="GitHub Pages clone root (used when --dest is omitted)",`
`66`	`66`	`)`
`67`		`- parser.add_argument("--version", type=int, default=3, help="Batch version tag (default: 3)")`
	`67`	`+ parser.add_argument("--version", type=int, default=2, help="Batch version tag (default: 2)")`
`68`	`68`	`args = parser.parse_args()`
`69`	`69`
`70`	`70`	`dest = args.dest or (args.publish_root / "insights.html")`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ def main() -> int:`
`66`	`66`	`default=Path("/lustre/backup/SHARED/AIN/agml/CY-Bench-dashboard"),`
`67`	`67`	`help="GitHub Pages clone root (used when --dest is omitted)",`
`68`	`68`	`)`
`69`		`- parser.add_argument("--version", type=int, default=3, help="Batch version tag (default: 3)")`
	`69`	`+ parser.add_argument("--version", type=int, default=2, help="Batch version tag (default: 2)")`
`70`	`70`	`args = parser.parse_args()`
`71`	`71`
`72`	`72`	`dest = args.dest or (args.publish_root / "model_families.html")`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ def main() -> int:`
`92`	`92`	`"--version",`
`93`	`93`	`type=int,`
`94`	`94`	`metavar="N",`
`95`		`- help="Limit to batch version suffix (e.g. 3 for baselines_DE_eos_v3)",`
	`95`	`+ help="Limit to batch version suffix (e.g. 2 for baselines_DE_eos_v2)",`
`96`	`96`	`)`
`97`	`97`	`parser.add_argument(`
`98`	`98`	`"--plot",`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ def main(argv: list[str] \| None = None) -> int:`
`122`	`122`	`"--version",`
`123`	`123`	`type=int,`
`124`	`124`	`metavar="N",`
`125`		`- help="Limit to batch version suffix (e.g. 3 for baselines_DE_eos_v3)",`
	`125`	`+ help="Limit to batch version suffix (e.g. 2 for baselines_DE_eos_v2)",`
`126`	`126`	`)`
`127`	`127`	`parser.add_argument(`
`128`	`128`	`"--stages",`