Split solvers.cpp into separated .cpp as in decompositions

Author: Lucas-Haubert

CMakeLists.txt

@@ -318,8 +318,15 @@ list(
 # ----------------------------------------------------
 # --- TARGETS ----------------------------------------
 # ----------------------------------------------------
-set(${PROJECT_NAME}_SOLVERS_SOURCES src/solvers/preconditioners.cpp
-                                    src/solvers/solvers.cpp)
+set(${PROJECT_NAME}_SOLVERS_SOURCES
+    src/solvers/preconditioners.cpp
+    src/solvers/solvers.cpp
+    src/solvers/minres.cpp
+    src/solvers/bicgstab.cpp
+    src/solvers/conjugate-gradient.cpp
+    src/solvers/least-squares-conjugate-gradient.cpp
+    src/solvers/incomplete-cholesky.cpp
+    src/solvers/incomplete-lut.cpp)
 
 set(${PROJECT_NAME}_DECOMPOSITIONS_SOURCES
     src/decompositions/decompositions.cpp

src/solvers/bicgstab.cpp

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2025 INRIA
+ */
+
+#include "eigenpy/solvers/BiCGSTAB.hpp"
+
+namespace eigenpy {
+void exposeBiCGSTAB() {
+  using namespace Eigen;
+  using Eigen::BiCGSTAB;
+  using Eigen::IdentityPreconditioner;
+  using IdentityBiCGSTAB = BiCGSTAB<MatrixXd, IdentityPreconditioner>;
+
+  BiCGSTABVisitor<BiCGSTAB<MatrixXd>>::expose("BiCGSTAB");
+  BiCGSTABVisitor<IdentityBiCGSTAB>::expose("IdentityBiCGSTAB");
+}
+}  // namespace eigenpy

src/solvers/conjugate-gradient.cpp

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2025 INRIA
+ */
+
+#include "eigenpy/solvers/ConjugateGradient.hpp"
+
+namespace eigenpy {
+void exposeConjugateGradient() {
+  using namespace Eigen;
+  using Eigen::ConjugateGradient;
+  using Eigen::IdentityPreconditioner;
+  using Eigen::Lower;
+  using IdentityConjugateGradient =
+      ConjugateGradient<MatrixXd, Lower, IdentityPreconditioner>;
+
+  ConjugateGradientVisitor<ConjugateGradient<MatrixXd, Lower>>::expose(
+      "ConjugateGradient");
+  ConjugateGradientVisitor<IdentityConjugateGradient>::expose(
+      "IdentityConjugateGradient");
+}
+}  // namespace eigenpy

src/solvers/incomplete-cholesky.cpp

@@ -0,0 +1,13 @@
+/*
+ * Copyright 2025 INRIA
+ */
+
+#include "eigenpy/solvers/IncompleteCholesky.hpp"
+
+namespace eigenpy {
+void exposeIncompleteCholesky() {
+  using namespace Eigen;
+  typedef SparseMatrix<double, ColMajor> ColMajorSparseMatrix;
+  IncompleteCholeskyVisitor<ColMajorSparseMatrix>::expose("IncompleteCholesky");
+}
+}  // namespace eigenpy

src/solvers/incomplete-lut.cpp

@@ -0,0 +1,12 @@
+/*
+ * Copyright 2025 INRIA
+ */
+
+#include "eigenpy/solvers/IncompleteLUT.hpp"
+
+namespace eigenpy {
+void exposeIncompleteLUT() {
+  typedef Eigen::SparseMatrix<double, Eigen::ColMajor> ColMajorSparseMatrix;
+  IncompleteLUTVisitor<ColMajorSparseMatrix>::expose("IncompleteLUT");
+}
+}  // namespace eigenpy

src/solvers/least-squares-conjugate-gradient.cpp

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2025 INRIA
+ */
+
+#include "eigenpy/solvers/LeastSquaresConjugateGradient.hpp"
+
+namespace eigenpy {
+void exposeLeastSquaresConjugateGradient() {
+  using namespace Eigen;
+  using Eigen::LeastSquaresConjugateGradient;
+
+  using Eigen::DiagonalPreconditioner;
+  using Eigen::IdentityPreconditioner;
+  using Eigen::LeastSquareDiagonalPreconditioner;
+
+  using IdentityLeastSquaresConjugateGradient =
+      LeastSquaresConjugateGradient<MatrixXd, IdentityPreconditioner>;
+  using DiagonalLeastSquaresConjugateGradient = LeastSquaresConjugateGradient<
+      MatrixXd, DiagonalPreconditioner<typename MatrixXd::Scalar>>;
+
+  LeastSquaresConjugateGradientVisitor<LeastSquaresConjugateGradient<
+      MatrixXd, LeastSquareDiagonalPreconditioner<MatrixXd::Scalar>>>::
+      expose("LeastSquaresConjugateGradient");
+  LeastSquaresConjugateGradientVisitor<IdentityLeastSquaresConjugateGradient>::
+      expose("IdentityLeastSquaresConjugateGradient");
+  LeastSquaresConjugateGradientVisitor<DiagonalLeastSquaresConjugateGradient>::
+      expose("DiagonalLeastSquaresConjugateGradient");
+}
+}  // namespace eigenpy

src/solvers/minres.cpp

@@ -0,0 +1,12 @@
+/*
+ * Copyright 2025 INRIA
+ */
+
+#include "eigenpy/solvers/MINRES.hpp"
+
+namespace eigenpy {
+void exposeMINRES() {
+  using namespace Eigen;
+  MINRESSolverVisitor<MatrixXd>::expose("MINRES");
+}
+}  // namespace eigenpy

src/solvers/solvers.cpp

@@ -2,67 +2,25 @@
  * Copyright 2017-2025 CNRS INRIA
  */
 
-#include <Eigen/Core>
-
-#if EIGEN_VERSION_AT_LEAST(3, 2, 0)
-
-#include "eigenpy/solvers/ConjugateGradient.hpp"
 #include "eigenpy/solvers/solvers.hpp"
 
-#if EIGEN_VERSION_AT_LEAST(3, 3, 5)
-#include "eigenpy/solvers/LeastSquaresConjugateGradient.hpp"
-#endif
-
-#include "eigenpy/solvers/BiCGSTAB.hpp"
-#include "eigenpy/solvers/MINRES.hpp"
-
-#include "eigenpy/solvers/IncompleteLUT.hpp"
-#include "eigenpy/solvers/IncompleteCholesky.hpp"
+#include "eigenpy/fwd.hpp"
 
 namespace eigenpy {
-void exposeSolvers() {
-  using namespace Eigen;
-
-  using Eigen::Lower;
-
-  using Eigen::BiCGSTAB;
-  using Eigen::ConjugateGradient;
-  using Eigen::LeastSquaresConjugateGradient;
 
-  using Eigen::DiagonalPreconditioner;
-  using Eigen::IdentityPreconditioner;
-  using Eigen::LeastSquareDiagonalPreconditioner;
+void exposeBiCGSTAB();
+void exposeMINRES();
+void exposeConjugateGradient();
+void exposeLeastSquaresConjugateGradient();
+void exposeIncompleteCholesky();
+void exposeIncompleteLUT();
 
-  using IdentityBiCGSTAB = BiCGSTAB<MatrixXd, IdentityPreconditioner>;
-  using IdentityConjugateGradient =
-      ConjugateGradient<MatrixXd, Lower, IdentityPreconditioner>;
-  using IdentityLeastSquaresConjugateGradient =
-      LeastSquaresConjugateGradient<MatrixXd, IdentityPreconditioner>;
-  using DiagonalLeastSquaresConjugateGradient = LeastSquaresConjugateGradient<
-      MatrixXd, DiagonalPreconditioner<typename MatrixXd::Scalar>>;
-
-  ConjugateGradientVisitor<ConjugateGradient<MatrixXd, Lower>>::expose(
-      "ConjugateGradient");
-  ConjugateGradientVisitor<IdentityConjugateGradient>::expose(
-      "IdentityConjugateGradient");
-
-  LeastSquaresConjugateGradientVisitor<LeastSquaresConjugateGradient<
-      MatrixXd, LeastSquareDiagonalPreconditioner<MatrixXd::Scalar>>>::
-      expose("LeastSquaresConjugateGradient");
-  LeastSquaresConjugateGradientVisitor<IdentityLeastSquaresConjugateGradient>::
-      expose("IdentityLeastSquaresConjugateGradient");
-  LeastSquaresConjugateGradientVisitor<DiagonalLeastSquaresConjugateGradient>::
-      expose("DiagonalLeastSquaresConjugateGradient");
-
-  BiCGSTABVisitor<BiCGSTAB<MatrixXd>>::expose("BiCGSTAB");
-  BiCGSTABVisitor<IdentityBiCGSTAB>::expose("IdentityBiCGSTAB");
-
-  MINRESSolverVisitor<MatrixXd>::expose("MINRES");
-
-  typedef SparseMatrix<double, ColMajor> ColMajorSparseMatrix;
-  IncompleteLUTVisitor<ColMajorSparseMatrix>::expose("IncompleteLUT");
-  IncompleteCholeskyVisitor<ColMajorSparseMatrix>::expose("IncompleteCholesky");
+void exposeSolvers() {
+  exposeBiCGSTAB();
+  exposeMINRES();
+  exposeConjugateGradient();
+  exposeLeastSquaresConjugateGradient();
+  exposeIncompleteCholesky();
+  exposeIncompleteLUT();
 }
 }  // namespace eigenpy
-
-#endif