[Py] Replace kwargs-to-struct by main params tables

kul-optec · Apr 3, 2024 · e638275 · e638275
1 parent 7ef3a4b
commit e638275
Show file tree

Hide file tree

Showing 53 changed files with 388 additions and 990 deletions.
diff --git a/interfaces/python/CMakeLists.txt b/interfaces/python/CMakeLists.txt
@@ -31,36 +31,17 @@ pybind11_add_module(_alpaqa MODULE
     "src/inner/inner-solver.py.cpp"
     "src/problem/problems.py.cpp"
     "src/proximal/prox.py.cpp"
-    "src/params/alm-params.cpp"
-    "src/params/anderson-direction-params.cpp"
-    "src/params/anderson-params.cpp"
-    "src/params/inner-solve-options.cpp"
-    "src/params/lbfgs-direction-params.cpp"
-    "src/params/lbfgs-params.cpp"
-    "src/params/panoc-params.cpp"
-    "src/params/fista-params.cpp"
-    "src/params/zerofpr-params.cpp"
-    "src/params/structured-lbfgs-direction-params.cpp"
-    "src/params/structured-newton-direction-params.cpp"
-    "src/params/convex-newton-direction-params.cpp"
-    "src/params/newton-tr-direction-params.cpp"
-    "src/params/pantr-params.cpp"
-    "src/params/steihaug-params.cpp"
     # NO_EXTRAS # Prevent pybind11 from stripping the binary
 )
 if (ALPAQA_WITH_OCP)
     target_sources(_alpaqa PRIVATE
         "src/inner/panoc-ocp.py.cpp"
         "src/inner/ocp.py.cpp"
-        "src/params/panoc-ocp-params.cpp"
-        "src/problem/control-problems.py.cpp"
-    )
+        "src/problem/control-problems.py.cpp")
 endif()
 if (ALPAQA_WITH_LBFGSB)
     target_sources(_alpaqa PRIVATE
-        "src/inner/lbfgsb.py.cpp"
-        "src/params/lbfgsb-params.cpp"
-    )
+        "src/inner/lbfgsb.py.cpp")
     target_link_libraries(_alpaqa PRIVATE alpaqa::lbfgsb-adapter)
 endif()
 target_include_directories(_alpaqa PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)

diff --git a/interfaces/python/src/accel/anderson.py.cpp b/interfaces/python/src/accel/anderson.py.cpp
@@ -10,8 +10,8 @@ using namespace py::literals;
 #include <alpaqa/accelerators/anderson.hpp>
 #include <alpaqa/util/check-dim.hpp>
 
+#include <dict/kwargs-to-struct.hpp>
 #include <dict/stats-to-dict.hpp>
-#include <params/params.hpp>
 
 template <alpaqa::Config Conf>
 void register_anderson(py::module_ &m) {

diff --git a/interfaces/python/src/accel/lbfgs.py.cpp b/interfaces/python/src/accel/lbfgs.py.cpp
@@ -10,8 +10,8 @@ using namespace py::literals;
 #include <alpaqa/accelerators/lbfgs.hpp>
 #include <alpaqa/util/check-dim.hpp>
 
+#include <dict/kwargs-to-struct.hpp>
 #include <dict/stats-to-dict.hpp>
-#include <params/params.hpp>
 
 template <alpaqa::Config Conf>
 void register_lbfgs(py::module_ &m) {

diff --git a/interfaces/python/src/alpaqa.py.cpp b/interfaces/python/src/alpaqa.py.cpp
@@ -101,7 +101,7 @@ PYBIND11_MODULE(MODULE_NAME, m) {
 #if ALPAQA_WITH_CASADI
     m.attr("with_casadi") = true;
 #else
-    m.attr("with_casadi") = false;
+    m.attr("with_casadi")          = false;
 #endif
 #if ALPAQA_WITH_EXTERNAL_CASADI
     m.attr("with_external_casadi") = true;
@@ -111,7 +111,7 @@ PYBIND11_MODULE(MODULE_NAME, m) {
 #if ALPAQA_WITH_CASADI_OCP
     m.attr("with_casadi_ocp") = true;
 #else
-    m.attr("with_casadi_ocp") = false;
+    m.attr("with_casadi_ocp")      = false;
 #endif
 
     py::register_exception<alpaqa::not_implemented_error>(m, "not_implemented_error",