slurm fix

Author: michielkallenberg

cybench/models/baseline_csv_paths.py

@@ -0,0 +1,18 @@
+"""Lightweight path helpers for LPJmL / TWSO baseline CSVs (no torch import)."""
+
+from __future__ import annotations
+
+from pathlib import Path
+
+from cybench.config import PATH_DATA_DIR
+
+LPJML_FILE_STEM = "lpjml"
+TWSO_FILE_STEM = "twso"
+
+
+def lpjml_csv_path(crop: str, country: str, data_dir: str | Path = PATH_DATA_DIR) -> Path:
+    return Path(data_dir) / crop / country / f"{LPJML_FILE_STEM}_{crop}_{country}.csv"
+
+
+def twso_csv_path(crop: str, country: str, data_dir: str | Path = PATH_DATA_DIR) -> Path:
+    return Path(data_dir) / crop / country / f"{TWSO_FILE_STEM}_{crop}_{country}.csv"

cybench/models/lpjml_model.py

@@ -12,12 +12,12 @@
 
 from cybench.config import KEY_LOC, KEY_TARGET, KEY_YEAR, PATH_DATA_DIR
 from cybench.datasets.dataset import PandasDataset
+from cybench.models.baseline_csv_paths import lpjml_csv_path
 from cybench.models.model import BaseModel
 from cybench.models.persistence import load_pickle, save_pickle
 
 log = logging.getLogger(__name__)
 
-LPJML_FILE_STEM = "lpjml"
 LPJML_COL_RAINFED = "lpj_yield_rainfed"
 LPJML_COL_IRRIGATED = "lpj_yield_irrigated"
 LPJML_VARIANTS = ("rainfed", "irrigated")
@@ -36,10 +36,6 @@ class _LocationCalibration(_MomentCalibration):
     n_years: int
 
 
-def lpjml_csv_path(crop: str, country: str, data_dir: str | Path = PATH_DATA_DIR) -> Path:
-    return Path(data_dir) / crop / country / f"{LPJML_FILE_STEM}_{crop}_{country}.csv"
-
-
 def _resolve_lpj_yield_series(df: pd.DataFrame, variant: str) -> pd.Series:
     """Pick rainfed, irrigated, or rainfed-with-irrigated fallback."""
     if variant not in LPJML_VARIANTS:

cybench/models/twso_model.py

@@ -11,6 +11,7 @@
 from cybench.config import CROP_CALENDAR_DATES, KEY_LOC, KEY_TARGET, KEY_YEAR, PATH_DATA_DIR
 from cybench.datasets.alignment import compute_crop_season_window
 from cybench.datasets.dataset import PandasDataset
+from cybench.models.baseline_csv_paths import twso_csv_path
 from cybench.models.lpjml_model import (
     _LocationCalibration,
     _MomentCalibration,
@@ -22,7 +23,6 @@
 
 log = logging.getLogger(__name__)
 
-TWSO_FILE_STEM = "twso"
 TWSO_COL = "twso"
 TWSO_SCALE = 0.001
 DEFAULT_START_OF_SEQUENCE = "sos-60"
@@ -34,10 +34,6 @@
 DEFAULT_MAX_DAYS_BEFORE_EOS = 14
 
 
-def twso_csv_path(crop: str, country: str, data_dir: str | Path = PATH_DATA_DIR) -> Path:
-    return Path(data_dir) / crop / country / f"{TWSO_FILE_STEM}_{crop}_{country}.csv"
-
-
 def crop_calendar_csv_path(
     crop: str, country: str, data_dir: str | Path = PATH_DATA_DIR
 ) -> Path:

cybench/runs/slurm/generate_job_manifest.py

@@ -12,8 +12,7 @@
 
 import cybench.config as config
 from cybench.config import DATASETS
-from cybench.models.lpjml_model import lpjml_csv_path
-from cybench.models.twso_model import twso_csv_path
+from cybench.models.baseline_csv_paths import lpjml_csv_path, twso_csv_path
 from cybench.runs.slurm.benchmark_completion_lib import (
     JobRow,
     check_screening_years,