openscvx 0.5.3.dev12__tar.gz → 0.5.3.dev13__tar.gz

{openscvx-0.5.3.dev12 → openscvx-0.5.3.dev13}/.github/workflows/tests-unit.yml

@@ -38,7 +38,6 @@ jobs:
 
     - name: Install dependencies
       run: |
-        # Install package with optional GUI and test packages
         uv pip install --system -e ".[gui,test]"
 
     - name: Run unit tests

{openscvx-0.5.3.dev12/openscvx.egg-info → openscvx-0.5.3.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openscvx
-Version: 0.5.3.dev12
+Version: 0.5.3.dev13
 Summary: A general Python-based successive convexification implementation which uses a JAX backend.
 Author-email: Chris Hayner and Griffin Norris <haynec@uw.edu>
 License: Apache Software License
@@ -10,7 +10,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: cvxpy>=1.8.1
+Requires-Dist: cvxpy<1.9,>=1.8.1
 Requires-Dist: qoco
 Requires-Dist: numpy
 Requires-Dist: jax

{openscvx-0.5.3.dev12 → openscvx-0.5.3.dev13}/openscvx/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.5.3.dev12'
-__version_tuple__ = version_tuple = (0, 5, 3, 'dev12')
+__version__ = version = '0.5.3.dev13'
+__version_tuple__ = version_tuple = (0, 5, 3, 'dev13')
 
-__commit_id__ = commit_id = 'g9149c4b81'
+__commit_id__ = commit_id = 'gf4df0a724'

{openscvx-0.5.3.dev12 → openscvx-0.5.3.dev13}/openscvx/solvers/moreau_ptr_solver.py

@@ -320,9 +320,9 @@ class MoreauPTRSolver(PTRSolver):
     def __init__(
         self,
         *,
-        max_iter: int = 200,
-        verbose: bool = False,
-        device: str = "auto",
+        max_iter: Optional[int] = None,
+        verbose: Optional[bool] = None,
+        device: Optional[str] = None,
         tol_gap_abs: Optional[float] = None,
         tol_feas: Optional[float] = None,
         solver_args: Optional[Dict] = None,
@@ -333,7 +333,18 @@ class MoreauPTRSolver(PTRSolver):
                 "Install it with: pip install openscvx[moreau]"
             )
 
-        _named = {"max_iter": max_iter, "verbose": verbose, "device": device}
+        # None sentinels at the signature surface let us distinguish
+        # "user explicitly passed this" from "default applied" — only the
+        # former should collide with the same key inside solver_args.
+        _named = {
+            k: v
+            for k, v in (
+                ("max_iter", max_iter),
+                ("verbose", verbose),
+                ("device", device),
+            )
+            if v is not None
+        }
         _extra = dict(solver_args) if solver_args else {}
         _overlap = _named.keys() & _extra.keys()
         if _overlap:
@@ -342,6 +353,9 @@ class MoreauPTRSolver(PTRSolver):
                 "and inside solver_args; use one or the other."
             )
         merged = {**_named, **_extra}
+        merged.setdefault("max_iter", 200)
+        merged.setdefault("verbose", False)
+        merged.setdefault("device", "auto")
 
         _ipm = {
             k: v for k, v in [("tol_gap_abs", tol_gap_abs), ("tol_feas", tol_feas)] if v is not None

{openscvx-0.5.3.dev12 → openscvx-0.5.3.dev13}/openscvx/solvers/qpax_ptr_solver.py

@@ -210,8 +210,8 @@ class QPAXPTRSolver(PTRSolver):
     def __init__(
         self,
         *,
-        solver_tol: float = 1e-5,
-        max_iter: int = 30,
+        solver_tol: Optional[float] = None,
+        max_iter: Optional[int] = None,
         solver_args: Optional[dict] = None,
     ):
         if not _QPAX_AVAILABLE:
@@ -220,7 +220,12 @@ class QPAXPTRSolver(PTRSolver):
                 "Install it with: pip install openscvx[qpax]"
             )
 
-        _named = {"solver_tol": solver_tol, "max_iter": max_iter}
+        # None sentinels at the signature surface let us distinguish
+        # "user explicitly passed this" from "default applied" — only the
+        # former should collide with the same key inside solver_args.
+        _named = {
+            k: v for k, v in (("solver_tol", solver_tol), ("max_iter", max_iter)) if v is not None
+        }
         _extra = dict(solver_args) if solver_args else {}
         _overlap = _named.keys() & _extra.keys()
         if _overlap:
@@ -228,7 +233,10 @@ class QPAXPTRSolver(PTRSolver):
                 f"QPAX settings {sorted(_overlap)} appear as both named arguments "
                 "and inside solver_args; use one or the other."
             )
-        self.solver_args = {**_named, **_extra}
+        merged = {**_named, **_extra}
+        merged.setdefault("solver_tol", 1e-5)
+        merged.setdefault("max_iter", 30)
+        self.solver_args = merged
 
         # Populated by create_variables / initialize.
         self.layout: Optional[_QPLayout] = None

{openscvx-0.5.3.dev12 → openscvx-0.5.3.dev13/openscvx.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openscvx
-Version: 0.5.3.dev12
+Version: 0.5.3.dev13
 Summary: A general Python-based successive convexification implementation which uses a JAX backend.
 Author-email: Chris Hayner and Griffin Norris <haynec@uw.edu>
 License: Apache Software License
@@ -10,7 +10,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: cvxpy>=1.8.1
+Requires-Dist: cvxpy<1.9,>=1.8.1
 Requires-Dist: qoco
 Requires-Dist: numpy
 Requires-Dist: jax

{openscvx-0.5.3.dev12 → openscvx-0.5.3.dev13}/openscvx.egg-info/requires.txt

@@ -1,4 +1,4 @@
-cvxpy>=1.8.1
+cvxpy<1.9,>=1.8.1
 qoco
 numpy
 jax

{openscvx-0.5.3.dev12 → openscvx-0.5.3.dev13}/pyproject.toml

@@ -17,7 +17,7 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
 ]
 dependencies = [
-    "cvxpy>=1.8.1",
+    "cvxpy>=1.8.1,<1.9",
     "qoco",
     "numpy",
     "jax",