update python interface

Author: ZedongPeng

python/README.md

@@ -163,7 +163,8 @@ Below is a list of commonly used parameters, their internal keys, and descriptio
 | `OptimalityNorm` | `optimality_norm` | string | `"l2"` | Norm for optimality criteria. Use `"l2"` for L2 norm or `"linf"` for infinity norm. |
 | `OptimalityTol` | `eps_optimal_relative` | float | `1e-4` | Relative tolerance for optimality gap. Solver stops if the relative primal-dual gap ≤ this value. |
 | `FeasibilityTol` | `eps_feasible_relative` | float | `1e-4` | Relative feasibility tolerance for primal/dual residuals. |
-| `RuizIters` | `l_inf_ruiz_iterations` | int | `10` | Number of iterations for L∞ Ruiz scaling. Improves numerical conditioning. |
+| `GeoMeanIters` | `geometric_mean_iterations` | int | `12` | Number of iterations of geometric-mean scaling. Improves numerical conditioning. |
+| `RuizIters` | `l_inf_ruiz_iterations` | int | `10` | Number of iterations of L∞ Ruiz scaling. Improves numerical conditioning. |
 | `UsePCAlpha` | `has_pock_chambolle_alpha` | bool | `True` | Whether to use the Pock–Chambolle α step size adjustment. |
 | `PCAlpha` | `pock_chambolle_alpha` | float | `1.0` | Value of the Pock–Chambolle α parameter. |
 | `BoundObjRescaling` | `bound_objective_rescaling` | bool | `True` | Whether to rescale the objective vector during preprocessing. |

python/cupdlpx/PDLP.py

@@ -42,6 +42,7 @@
     "OptimalityTol": "eps_optimal_relative",
     "FeasibilityTol": "eps_feasible_relative",
     # scaling / step size
+    "GeoMeanIters": "geometric_mean_iterations",
     "RuizIters": "l_inf_ruiz_iterations",
     "UsePCAlpha": "has_pock_chambolle_alpha",
     "PCAlpha": "pock_chambolle_alpha",

src/utils.cu

@@ -301,8 +301,8 @@ bool should_do_adaptive_restart(pdhg_solver_state_t *solver_state,
 
 void set_default_parameters(pdhg_parameters_t *params)
 {
-    params->l_inf_ruiz_iterations = 10;
     params->geometric_mean_iterations = 12;
+    params->l_inf_ruiz_iterations = 10;
     params->has_pock_chambolle_alpha = true;
     params->pock_chambolle_alpha = 1.0;
     params->bound_objective_rescaling = true;

test/test_api_surface.py

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
-
 import numpy as np
 import scipy.sparse as sp
 import pytest
@@ -412,18 +410,3 @@ def test_optimize_rejects_bad_sense(base_lp_data):
     model._model_sense = 999  # bypass the property to hit optimize()'s guard
     with pytest.raises(ValueError):
         model.optimize()
-
-
-def test_read_mps_roundtrip():
-    """read() loads an MPS file into a usable Model."""
-    path = os.path.join(os.path.dirname(__file__), "cplex2.mps")
-    model = read(path)
-    assert model.num_vars > 0
-    assert model.num_constrs > 0
-    assert model.A.shape == (model.num_constrs, model.num_vars)
-    assert model.ModelSense in (PDLP.MINIMIZE, PDLP.MAXIMIZE)
-
-
-def test_read_mps_missing_file():
-    with pytest.raises(FileNotFoundError):
-        read("this_file_does_not_exist.mps")