diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f6b602..0234c9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ include(FetchContent) FetchContent_Declare( qoco GIT_REPOSITORY https://github.com/qoco-org/qoco.git - GIT_TAG 0771532c6195e7669eada2e062d98d3065da9bd0 + GIT_TAG 6dd96bf4cd231518c781e7c2bf296fa55b464610 ) list(POP_BACK CMAKE_MESSAGE_INDENT) @@ -41,4 +41,4 @@ elseif(${QOCO_ALGEBRA_BACKEND} STREQUAL "cuda") enable_language(CUDA) find_package(CUDA) target_link_libraries(qoco_cuda PUBLIC pybind11::module qocostatic) -endif() \ No newline at end of file +endif() diff --git a/src/bindings.cpp.in b/src/bindings.cpp.in index 15526d3..cd1fc33 100644 --- a/src/bindings.cpp.in +++ b/src/bindings.cpp.in @@ -340,12 +340,15 @@ PYBIND11_MODULE(@QOCO_EXT_MODULE_NAME@, m) { return new QOCOSettings(); })) .def_readwrite("max_iters", &QOCOSettings::max_iters) .def_readwrite("ruiz_iters", &QOCOSettings::ruiz_iters) - .def_readwrite("iter_ref_iters", &QOCOSettings::iter_ref_iters) + .def_readwrite("max_ir_iters", &QOCOSettings::max_ir_iters) + .def_readwrite("ir_tol", &QOCOSettings::ir_tol) .def_readwrite("abstol", &QOCOSettings::abstol) .def_readwrite("reltol", &QOCOSettings::reltol) .def_readwrite("abstol_inacc", &QOCOSettings::abstol_inacc) .def_readwrite("reltol_inacc", &QOCOSettings::reltol_inacc) - .def_readwrite("kkt_static_reg", &QOCOSettings::kkt_static_reg) + .def_readwrite("kkt_static_reg_P", &QOCOSettings::kkt_static_reg_P) + .def_readwrite("kkt_static_reg_A", &QOCOSettings::kkt_static_reg_A) + .def_readwrite("kkt_static_reg_G", &QOCOSettings::kkt_static_reg_G) .def_readwrite("kkt_dynamic_reg", &QOCOSettings::kkt_dynamic_reg) .def_readwrite("verbose", &QOCOSettings::verbose); diff --git a/tests/test_lcvx_bad_scale.py b/tests/test_lcvx_bad_scale.py index bc093b3..21edc93 100644 --- a/tests/test_lcvx_bad_scale.py +++ b/tests/test_lcvx_bad_scale.py @@ -92,7 +92,7 @@ def test_lcvx_bad_scaling(): prob_qoco = qoco.QOCO() prob_qoco.setup( - n, m, p, P, c, A, b, G, h, l, nsoc, q, ruiz_iters=5, iter_ref_iters=3 + n, m, p, P, c, A, b, G, h, l, nsoc, q, ruiz_iters=5, max_ir_iters=3 ) # Solve problem.