Merge branch 'fixes' into out-of-sample-testing

* fixes:
  Allowing model to fit on different target cols
  Moved argparse to main block and calling main from there
  Added more ignores
  Fixes the hetzner download

Author: ArneTR

.gitignore

@@ -52,3 +52,7 @@ Mkfile.old
 dkms.conf
 __pycache__
 venv/
+sftp-config.json
+procpower.sublime-project
+procpower.sublime-workspace
+TODOS.md

tools/benchmark.sh

@@ -34,7 +34,7 @@ FILE_MB=512
 MEM_MB=512
 CPU_WORKERS="$(nproc)"
 WAKEUP_THREADS="$(nproc)"
-NET_URL="https://speed.hetzner.de/100MB.bin"
+NET_URL="https://nbg1-speed.hetzner.com/100MB.bin"
 
 while [[ $# -gt 0 ]]; do
     case "$1" in

tools/model.py

@@ -35,7 +35,7 @@ class FeatureSpec:
     FeatureSpec("tx", "w_net_tx_packets", 1.0, True),
 ]
 
-TARGET_COL = "rapl_psys_sum_uj"
+TARGET_COL = None # will be overridden later
 FEATURE_COLS = [f.param_name for f in FEATURES]
 BASELINE_WEIGHTS = {
     "w_cpu_ns": 5.0,
@@ -392,19 +392,9 @@ def print_metrics(label: str, metrics: dict[str, float]) -> None:
     print(f"MAPE   : {metrics['mape_pct']:.3f} %" if np.isfinite(metrics["mape_pct"]) else "MAPE   : n/a")
 
 
-def main() -> None:
-    parser = argparse.ArgumentParser(
-        description="Train nonlinear PSYS model and distill to kernel-friendly linear+multi-LUT params."
-    )
-    parser.add_argument("logfiles", nargs="+", type=Path)
-    parser.add_argument("--test-data", type=Path, help="Optional separate dataset for testing")
-    parser.add_argument("--mode", choices=("delta",), default="delta")
-    parser.add_argument("--alpha", type=float, default=10.0, help="L2 strength for non-negative linear fit")
-    parser.add_argument("--test-frac", type=float, default=0.2)
-    parser.add_argument("--min-target-uj", type=float, default=1.0)
-    parser.add_argument("--trim-upper-quantile", type=float, default=0.999)
-    parser.add_argument("--random-seed", type=int, default=42)
-    args = parser.parse_args()
+def main(args) -> None:
+    global TARGET_COL
+    TARGET_COL = args.target
 
     # Check all files exist
     for path in args.logfiles:
@@ -579,4 +569,18 @@ def main() -> None:
 
 
 if __name__ == "__main__":
-    main()
+    parser = argparse.ArgumentParser(
+        description="Train nonlinear PSYS model and distill to kernel-friendly linear+multi-LUT params."
+    )
+    parser.add_argument("logfiles", nargs="+", type=Path)
+    parser.add_argument("--mode", choices=("delta",), default="delta")
+    parser.add_argument("--alpha", type=float, default=10.0, help="L2 strength for non-negative linear fit")
+    parser.add_argument("--test-frac", type=float, default=0.2)
+    parser.add_argument("--min-target-uj", type=float, default=1.0)
+    parser.add_argument("--trim-upper-quantile", type=float, default=0.999)
+    parser.add_argument("--random-seed", type=int, default=42)
+    parser.add_argument("--target", type=str, choices=["rapl_psys_sum_uj", "rapl_core_sum_uj"], default="rapl_psys_sum_uj")
+
+    args = parser.parse_args()
+
+    main(args)