sip-python 0.0.3__tar.gz → 0.0.5__tar.gz

{sip_python-0.0.3 → sip_python-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sip_python
-Version: 0.0.3
+Version: 0.0.5
 Summary: Python bindings for the SIP solver.
 Author-email: João Sousa-Pinto <joaospinto@gmail.com>
 Project-URL: Homepage, https://github.com/joaospinto/sip_python
@@ -12,6 +12,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: scipy
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
 Dynamic: license-file
 
 # sip_python

{sip_python-0.0.3 → sip_python-0.0.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sip_python"
-version = "0.0.3"
+version = "0.0.5"
 description = "Python bindings for the SIP solver."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -19,5 +19,10 @@ dependencies = [
     "scipy",
 ]
 
+[project.optional-dependencies]
+test = [
+    "pytest",
+]
+
 [project.urls]
 Homepage = "https://github.com/joaospinto/sip_python"

{sip_python-0.0.3 → sip_python-0.0.5}/src/sip_python/helpers.py

@@ -33,11 +33,10 @@ except Exception:
 
 def _amd_order(K_csc):
     """Compute AMD ordering on a CSC matrix via libamd."""
-    K_sym = (K_csc + K_csc.T).tocsc()
-    K_sym.sort_indices()
-    n = K_sym.shape[0]
-    Ap = K_sym.indptr.astype(np.int64)
-    Ai = K_sym.indices.astype(np.int64)
+    K_csc.sort_indices()
+    n = K_csc.shape[0]
+    Ap = K_csc.indptr.astype(np.int64)
+    Ai = K_csc.indices.astype(np.int64)
     perm = np.empty(n, dtype=np.int64)
     ret = _libamd.amd_l_order(
         n,
@@ -72,6 +71,7 @@ def get_K(P, A, G):
 
     mod_P = spa.csc_matrix.copy(P)
     mod_P.data[:] = 1.0
+    mod_P = mod_P + mod_P.T
 
     Z = spa.csc_matrix((y_dim, s_dim))
 
@@ -114,8 +114,9 @@ def get_kkt_and_L_nnzs(K, perm_inv):
     permuted_K.col = perm_inv[permuted_K.col]
 
     kkt_L_nnz = getLnnz(spa.triu(permuted_K))
+    kkt_nnz = spa.triu(permuted_K).nnz
 
-    return K.nnz, kkt_L_nnz
+    return kkt_nnz, kkt_L_nnz
 
 
 def get_kkt_perm_inv_and_nnzs(P, A, G, verbose=True):

{sip_python-0.0.3 → sip_python-0.0.5}/src/sip_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sip_python
-Version: 0.0.3
+Version: 0.0.5
 Summary: Python bindings for the SIP solver.
 Author-email: João Sousa-Pinto <joaospinto@gmail.com>
 Project-URL: Homepage, https://github.com/joaospinto/sip_python
@@ -12,6 +12,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: scipy
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
 Dynamic: license-file
 
 # sip_python

sip_python-0.0.5/src/sip_python.egg-info/requires.txt

@@ -0,0 +1,5 @@
+numpy
+scipy
+
+[test]
+pytest

{sip_python-0.0.3 → sip_python-0.0.5}/tests/test_simple_constrained_lqr.py

@@ -22,18 +22,18 @@ jax.config.update("jax_enable_x64", True)
 
 def test_simple_constrained_lqr():
     ss = Settings()
-    ss.max_kkt_violation = 1e-6
-    ss.enable_elastics = True
-    ss.elastic_var_cost_coeff = 1e6
+    ss.termination.max_dual_residual = 1e-6
+    ss.termination.max_constraint_violation = 1e-6
+    ss.termination.max_complementarity_gap = 1e-6
     ss.assert_checks_pass = True
-    ss.penalty_parameter_increase_factor = 2.0
-    ss.mu_update_factor = 0.9
+    ss.penalty.penalty_parameter_increase_factor = 2.0
+    ss.barrier.mu_update_factor = 0.9
     ss.max_iterations = 200
-    ss.max_ls_iterations = 1000
-    ss.print_logs = False
-    ss.print_line_search_logs = False
-    ss.print_search_direction_logs = False
-    ss.print_derivative_check_logs = False
+    ss.line_search.max_iterations = 1000
+    ss.logging.print_logs = False
+    ss.logging.print_line_search_logs = False
+    ss.logging.print_search_direction_logs = False
+    ss.logging.print_derivative_check_logs = False
 
     x_dim = 2
     u_dim = 1
@@ -187,7 +187,6 @@ def test_simple_constrained_lqr():
     vars.x[:] = 0.0
     vars.s[:] = 1.0
     vars.y[:] = 0.0
-    vars.e[:] = 0.0
     vars.z[:] = 1.0
 
     output = solver.solve(vars)

{sip_python-0.0.3 → sip_python-0.0.5}/tests/test_simple_lqr.py

@@ -22,16 +22,16 @@ jax.config.update("jax_enable_x64", True)
 
 def test_simple_lqr():
     ss = Settings()
-    ss.max_kkt_violation = 1e-6
-    ss.enable_elastics = True
-    ss.elastic_var_cost_coeff = 1e6
+    ss.termination.max_dual_residual = 1e-6
+    ss.termination.max_constraint_violation = 1e-6
+    ss.termination.max_complementarity_gap = 1e-6
     ss.assert_checks_pass = True
-    ss.penalty_parameter_increase_factor = 2.0
-    ss.mu_update_factor = 0.9
-    ss.print_logs = False
-    ss.print_line_search_logs = False
-    ss.print_search_direction_logs = False
-    ss.print_derivative_check_logs = False
+    ss.penalty.penalty_parameter_increase_factor = 2.0
+    ss.barrier.mu_update_factor = 0.9
+    ss.logging.print_logs = False
+    ss.logging.print_line_search_logs = False
+    ss.logging.print_search_direction_logs = False
+    ss.logging.print_derivative_check_logs = False
 
     x_dim = 2
     u_dim = 1
@@ -163,7 +163,6 @@ def test_simple_lqr():
     vars.x[:] = 0.0
     vars.s[:] = 1.0
     vars.y[:] = 0.0
-    vars.e[:] = 0.0
     vars.z[:] = 1.0
 
     output = solver.solve(vars)

{sip_python-0.0.3 → sip_python-0.0.5}/tests/test_simple_nlp.py

@@ -22,14 +22,14 @@ jax.config.update("jax_enable_x64", True)
 
 def test_simple_qp():
     ss = Settings()
-    ss.max_kkt_violation = 1e-6
-    ss.enable_elastics = True
-    ss.elastic_var_cost_coeff = 1e6
+    ss.termination.max_dual_residual = 1e-6
+    ss.termination.max_constraint_violation = 1e-6
+    ss.termination.max_complementarity_gap = 1e-6
     ss.assert_checks_pass = True
-    ss.print_logs = False
-    ss.print_line_search_logs = False
-    ss.print_search_direction_logs = False
-    ss.print_derivative_check_logs = False
+    ss.logging.print_logs = False
+    ss.logging.print_line_search_logs = False
+    ss.logging.print_search_direction_logs = False
+    ss.logging.print_derivative_check_logs = False
 
     @jax.jit
     def f(x):
@@ -133,7 +133,6 @@ def test_simple_qp():
     vars.x[:] = 0.0
     vars.s[:] = 1.0
     vars.y[:] = 0.0
-    vars.e[:] = 0.0
     vars.z[:] = 1.0
 
     output = solver.solve(vars)

{sip_python-0.0.3 → sip_python-0.0.5}/tests/test_simple_qp.py

@@ -22,14 +22,14 @@ jax.config.update("jax_enable_x64", True)
 
 def test_simple_qp():
     ss = Settings()
-    ss.max_kkt_violation = 1e-6
-    ss.enable_elastics = True
-    ss.elastic_var_cost_coeff = 1e6
+    ss.termination.max_dual_residual = 1e-6
+    ss.termination.max_constraint_violation = 1e-6
+    ss.termination.max_complementarity_gap = 1e-6
     ss.assert_checks_pass = True
-    ss.print_logs = False
-    ss.print_line_search_logs = False
-    ss.print_search_direction_logs = False
-    ss.print_derivative_check_logs = False
+    ss.logging.print_logs = False
+    ss.logging.print_line_search_logs = False
+    ss.logging.print_search_direction_logs = False
+    ss.logging.print_derivative_check_logs = False
 
     @jax.jit
     def f(x):
@@ -132,7 +132,6 @@ def test_simple_qp():
     vars.x[:] = 0.0
     vars.s[:] = 1.0
     vars.y[:] = 0.0
-    vars.e[:] = 0.0
     vars.z[:] = 1.0
 
     output = solver.solve(vars)

sip_python-0.0.3/src/sip_python.egg-info/requires.txt

@@ -1,2 +0,0 @@
-numpy
-scipy