Switch IncompleteLUT and IncompleteCholesky in eigenpy.solvers scope

Author: Lucas-Haubert

CMakeLists.txt

@@ -195,7 +195,9 @@ set(${PROJECT_NAME}_SOLVERS_HEADERS
     include/eigenpy/solvers/ConjugateGradient.hpp
     include/eigenpy/solvers/SparseSolverBase.hpp
     include/eigenpy/solvers/BasicPreconditioners.hpp
-    include/eigenpy/solvers/BFGSPreconditioners.hpp)
+    include/eigenpy/solvers/BFGSPreconditioners.hpp
+    include/eigenpy/solvers/IncompleteCholesky.hpp
+    include/eigenpy/solvers/IncompleteLUT.hpp)
 
 set(${PROJECT_NAME}_EIGEN_HEADERS include/eigenpy/eigen/EigenBase.hpp)
 
@@ -214,9 +216,7 @@ set(${PROJECT_NAME}_DECOMPOSITIONS_SPARSE_HEADERS
     include/eigenpy/decompositions/sparse/LDLT.hpp
     include/eigenpy/decompositions/sparse/LU.hpp
     include/eigenpy/decompositions/sparse/SimplicialCholesky.hpp
-    include/eigenpy/decompositions/sparse/SparseSolverBase.hpp
-    include/eigenpy/decompositions/sparse/IncompleteCholesky.hpp
-    include/eigenpy/decompositions/sparse/IncompleteLUT.hpp)
+    include/eigenpy/decompositions/sparse/SparseSolverBase.hpp)
 
 if(BUILD_WITH_CHOLMOD_SUPPORT)
   list(APPEND ${PROJECT_NAME}_DECOMPOSITIONS_SPARSE_HEADERS
@@ -341,9 +341,7 @@ set(${PROJECT_NAME}_DECOMPOSITIONS_SOURCES
     src/decompositions/self-adjoint-eigen-solver.cpp
     src/decompositions/permutation-matrix.cpp
     src/decompositions/simplicial-llt-solver.cpp
-    src/decompositions/simplicial-ldlt-solver.cpp
-    src/decompositions/incomplete-cholesky.cpp
-    src/decompositions/incomplete-lut.cpp)
+    src/decompositions/simplicial-ldlt-solver.cpp)
 
 if(BUILD_WITH_CHOLMOD_SUPPORT)
   list(APPEND ${PROJECT_NAME}_DECOMPOSITIONS_SOURCES

include/eigenpy/decompositions/sparse/IncompleteCholesky.hpp renamed to include/eigenpy/solvers/IncompleteCholesky.hpp

@@ -25,8 +25,6 @@ void exposePartialPivLUSolver();
 void exposeQRSolvers();
 void exposeSimplicialLLTSolver();
 void exposeSimplicialLDLTSolver();
-void exposeIncompleteCholesky();
-void exposeIncompleteLUT();
 void exposeSparseLUSolver();
 void exposeSparseQRSolver();
 void exposePermutationMatrix();
@@ -72,8 +70,6 @@ void exposeDecompositions() {
   exposeSimplicialLDLTSolver();
   exposeSparseLUSolver();
   exposeSparseQRSolver();
-  exposeIncompleteCholesky();
-  exposeIncompleteLUT();
 
   exposePermutationMatrix();
 

include/eigenpy/decompositions/sparse/IncompleteLUT.hpp renamed to include/eigenpy/solvers/IncompleteLUT.hpp

@@ -16,6 +16,9 @@
 #include "eigenpy/solvers/BiCGSTAB.hpp"
 #include "eigenpy/solvers/MINRES.hpp"
 
+#include "eigenpy/solvers/IncompleteLUT.hpp"
+#include "eigenpy/solvers/IncompleteCholesky.hpp"
+
 namespace eigenpy {
 void exposeSolvers() {
   using namespace Eigen;
@@ -57,6 +60,10 @@ void exposeSolvers() {
   BiCGSTABVisitor<IdentityBiCGSTAB>::expose("IdentityBiCGSTAB");
 
   MINRESSolverVisitor<MatrixXd>::expose("MINRES");
+
+  typedef SparseMatrix<double, ColMajor> ColMajorSparseMatrix;
+  IncompleteLUTVisitor<ColMajorSparseMatrix>::expose("IncompleteLUT");
+  IncompleteCholeskyVisitor<ColMajorSparseMatrix>::expose("IncompleteCholesky");
 }
 }  // namespace eigenpy
 

src/decompositions/decompositions.cpp

@@ -217,12 +217,10 @@ if(BUILD_TESTING_SCIPY)
   add_python_eigenpy_unit_test(
     "py-SimplicialLDLT"
     "unittest/python/decompositions/sparse/test_SimplicialLDLT.py")
-  add_python_eigenpy_unit_test(
-    "py-IncompleteCholesky"
-    "unittest/python/decompositions/sparse/test_IncompleteCholesky.py")
-  add_python_eigenpy_unit_test(
-    "py-IncompleteLUT"
-    "unittest/python/decompositions/sparse/test_IncompleteLUT.py")
+  add_python_eigenpy_unit_test("py-IncompleteCholesky"
+                               "unittest/python/test_IncompleteCholesky.py")
+  add_python_eigenpy_unit_test("py-IncompleteLUT"
+                               "unittest/python/test_IncompleteLUT.py")
   add_python_eigenpy_unit_test(
     "py-SparseLU" "unittest/python/decompositions/sparse/test_SparseLU.py")
   add_python_eigenpy_unit_test(

src/decompositions/incomplete-cholesky.cpp

@@ -10,7 +10,7 @@
 A = (A + A.T) * 0.5 + np.diag(5.0 + rng.random(dim))
 A = csc_matrix(A)
 
-ichol = eigenpy.IncompleteCholesky(A)
+ichol = eigenpy.solvers.IncompleteCholesky(A)
 assert ichol.info() == eigenpy.ComputationInfo.Success
 assert ichol.rows() == dim
 assert ichol.cols() == dim

src/decompositions/incomplete-lut.cpp

@@ -10,7 +10,7 @@
 A = (A + A.T) * 0.5 + np.diag(5.0 + rng.random(dim))
 A = csc_matrix(A)
 
-ilut = eigenpy.IncompleteLUT(A)
+ilut = eigenpy.solvers.IncompleteLUT(A)
 assert ilut.info() == eigenpy.ComputationInfo.Success
 assert ilut.rows() == dim
 assert ilut.cols() == dim
@@ -40,10 +40,10 @@
 ilut.factorize(A)
 assert ilut.info() == eigenpy.ComputationInfo.Success
 
-ilut_params = eigenpy.IncompleteLUT(A, 1e-4, 15)
+ilut_params = eigenpy.solvers.IncompleteLUT(A, 1e-4, 15)
 assert ilut_params.info() == eigenpy.ComputationInfo.Success
 
-ilut_set = eigenpy.IncompleteLUT()
+ilut_set = eigenpy.solvers.IncompleteLUT()
 ilut_set.setDroptol(1e-3)
 ilut_set.setFillfactor(20)
 ilut_set.compute(A)