Issue 435: run_solver.py re-structuring and hipo inclusion

pytest.ini

@@ -1,2 +1,3 @@
 [pytest]
 norecursedirs = pocs
+addopts = --ignore=tests/test_run_benchmarks.py

runner/README.md

@@ -85,24 +85,38 @@ python run_benchmarks.py ../results/metadata.yaml 2024 --run_id "debug-run-001"
 Use `run_solver.py` to test a single solver on a single benchmark problem. This is useful for debugging:
 
 ```bash
-python run_solver.py <solver_name> <input_file> <solver_version>
+python runner/run_solver.py \
+    --solver_name <solver_name> \
+    --solver_version <solver_version> \
+    --input_file <input_file> \
+    --highs_solver_variant <highs_solver_variant> \
+    --hipo_block_size <hipo_block_size>
 ```
 
 **Arguments:**
-- `solver_name` - Solver name (highs, scip, cbc, gurobi, glpk)
-- `input_file` - Path to benchmark problem file (.lp or .mps)
-- `solver_version` - Solver version string (e.g., 1.10.0)
+- `solver_name` - Name of the solver to run (e.g., `highs`, `glpk`, `gurobi`, `scip`, `cbc`, `cplex`, `knitro`, `xpress`).
+- `solver_version` -  Version of the solver to use.
+- `input_file` - Path to the input problem file (e.g., `.mps`, `.lp`).
+- `highs_solver_variant` - Variant of HiGHS to run (`hipo`, `ipm`, `ipx`, `pdlp`, `simplex` - default: `simplex`). Only for HiGHS.
+- `hipo_block_size` - Block size for HiPO variant of HiGHS (default: `128`). Only for HiGHS with `hipo` solver variant.
 
 **Examples:**
 
 ```bash
-# Test HiGHS
-conda activate benchmark-2024
-python run_solver.py highs ./benchmarks/pypsa-eur-elec-op-2-1h.lp 1.10.0
+# Test HiGHS (simplex variant)
+conda activate benchmark-2025
+python runner/run_solver.py \
+    --solver_name highs \
+    --solver_version 1.13.2.dev1 \
+    --input_file ./benchmarks/pypsa-eur-elec-op-2-1h.lp \
+    --highs_solver_variant simplex
 
 # Test SCIP
-conda activate benchmark-2024
-python run_solver.py scip ./benchmarks/pypsa-eur-elec-op-2-1h.lp 9.2.2
+conda activate benchmark-2025
+python runner/run_solver.py \
+    --solver_name scip \
+    --solver_version 9.2.2 \
+    --input_file ./benchmarks/pypsa-eur-elec-op-2-1h.lp
 ```
 
 **Output:**

runner/benchmark_all.sh

@@ -75,7 +75,7 @@ for year in "${years[@]}"; do
         solver_args="--solvers ${solvers_override}"
         echo "Using solver override: ${solvers_override}"
     else
-        solver_args="--solvers gurobi highs-hipo highs-ipm highs scip cbc glpk"
+        solver_args="--solvers gurobi highs-hipo highs-ipm highs scip glpk"
     fi
 
     # Overwrite results for the first year, append thereafter

runner/envs/benchmark-2026.yaml

@@ -0,0 +1,19 @@
+name: benchmark-2026
+channels:
+- conda-forge/label/dev
+- conda-forge
+- https://conda.anaconda.org/gurobi
+- nodefaults
+dependencies:
+- python>=3.12
+- pip
+- psutil>=5.9
+- requests>=2.32
+- linopy>=0.6.4
+- coin-or-cbc==2.10.12
+- scip==10.0.0
+- pyscipopt==5.7.1
+- gurobi==13.0.0
+
+# Install highspy from conda-forge dev label
+- highspy==1.13.2.dev1