Skip to content

Commit e65d813

Browse files
authored
QOCO Robustification (#7)
1 parent fec4601 commit e65d813

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ include(FetchContent)
2323
FetchContent_Declare(
2424
qoco
2525
GIT_REPOSITORY https://github.com/qoco-org/qoco.git
26-
GIT_TAG 0771532c6195e7669eada2e062d98d3065da9bd0
26+
GIT_TAG 6dd96bf4cd231518c781e7c2bf296fa55b464610
2727
)
2828

2929
list(POP_BACK CMAKE_MESSAGE_INDENT)
@@ -41,4 +41,4 @@ elseif(${QOCO_ALGEBRA_BACKEND} STREQUAL "cuda")
4141
enable_language(CUDA)
4242
find_package(CUDA)
4343
target_link_libraries(qoco_cuda PUBLIC pybind11::module qocostatic)
44-
endif()
44+
endif()

src/bindings.cpp.in

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,12 +340,15 @@ PYBIND11_MODULE(@QOCO_EXT_MODULE_NAME@, m)
340340
{ return new QOCOSettings(); }))
341341
.def_readwrite("max_iters", &QOCOSettings::max_iters)
342342
.def_readwrite("ruiz_iters", &QOCOSettings::ruiz_iters)
343-
.def_readwrite("iter_ref_iters", &QOCOSettings::iter_ref_iters)
343+
.def_readwrite("max_ir_iters", &QOCOSettings::max_ir_iters)
344+
.def_readwrite("ir_tol", &QOCOSettings::ir_tol)
344345
.def_readwrite("abstol", &QOCOSettings::abstol)
345346
.def_readwrite("reltol", &QOCOSettings::reltol)
346347
.def_readwrite("abstol_inacc", &QOCOSettings::abstol_inacc)
347348
.def_readwrite("reltol_inacc", &QOCOSettings::reltol_inacc)
348-
.def_readwrite("kkt_static_reg", &QOCOSettings::kkt_static_reg)
349+
.def_readwrite("kkt_static_reg_P", &QOCOSettings::kkt_static_reg_P)
350+
.def_readwrite("kkt_static_reg_A", &QOCOSettings::kkt_static_reg_A)
351+
.def_readwrite("kkt_static_reg_G", &QOCOSettings::kkt_static_reg_G)
349352
.def_readwrite("kkt_dynamic_reg", &QOCOSettings::kkt_dynamic_reg)
350353
.def_readwrite("verbose", &QOCOSettings::verbose);
351354

tests/test_lcvx_bad_scale.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def test_lcvx_bad_scaling():
9292
prob_qoco = qoco.QOCO()
9393

9494
prob_qoco.setup(
95-
n, m, p, P, c, A, b, G, h, l, nsoc, q, ruiz_iters=5, iter_ref_iters=3
95+
n, m, p, P, c, A, b, G, h, l, nsoc, q, ruiz_iters=5, max_ir_iters=3
9696
)
9797

9898
# Solve problem.

0 commit comments

Comments
 (0)