add cholmod_support unit tests

4 files changed, 68 insertions, 7 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ac2413ef3..89fb48a01 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -25,6 +25,7 @@ if(CHOLMOD_FOUND AND BLAS_FOUND AND LAPACK_FOUND)
   add_definitions("-DEIGEN_CHOLMOD_SUPPORT")
   include_directories(${CHOLMOD_INCLUDES})
   set(SPARSE_LIBS ${SPARSE_LIBS} ${CHOLMOD_LIBRARIES} ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
+  set(CHOLMOD_ALL_LIBS  ${CHOLMOD_LIBRARIES} ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
   ei_add_property(EIGEN_TESTED_BACKENDS "Cholmod, ")
 else()
   ei_add_property(EIGEN_MISSING_BACKENDS "Cholmod, ")
@@ -67,7 +68,6 @@ if(TEST_LIB)
   add_definitions("-DEIGEN_EXTERN_INSTANTIATIONS=1")
 endif(TEST_LIB)
 
-ei_add_test(pardiso_support)
 ei_add_test(meta)
 ei_add_test(sizeof)
 ei_add_test(dynalloc)
@@ -172,14 +172,20 @@ ei_add_test(conjugate_gradient)
 ei_add_test(bicgstab)
 
 if(UMFPACK_FOUND)
-  ei_add_test(umfpack_support   "" "${UMFPACK_ALL_LIBS}")
+  ei_add_test(umfpack_support "" "${UMFPACK_ALL_LIBS}")
 endif()
 
 if(SUPERLU_FOUND)
-  ei_add_test(superlu_support   "" "${SUPERLU_ALL_LIBS}")
+  ei_add_test(superlu_support "" "${SUPERLU_ALL_LIBS}")
 endif()
 
+if(CHOLMOD_FOUND)
+  ei_add_test(cholmod_support "" "${CHOLMOD_ALL_LIBS}")
+endif()
 
+if(PARDISO_FOUND)
+  ei_add_test(pardiso_support "" "${PARDISO_ALL_LIBS}")
+endif()
 
 string(TOLOWER "${CMAKE_CXX_COMPILER}" cmake_cxx_compiler_tolower)
 if(cmake_cxx_compiler_tolower MATCHES "qcc")
diff --git a/test/cholmod_support.cpp b/test/cholmod_support.cpp
new file mode 100644
index 000000000..a5de86f60
--- /dev/null
+++ b/test/cholmod_support.cpp
@@ -0,0 +1,59 @@
+// This file is part of Eigen, a lightweight C++ template library
+// for linear algebra.
+//
+// Copyright (C) 2011 Gael Guennebaud <g.gael@free.fr>
+//
+// Eigen is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 3 of the License, or (at your option) any later version.
+//
+// Alternatively, you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of
+// the License, or (at your option) any later version.
+//
+// Eigen is distributed in the hope that it will be useful, but WITHOUT ANY
+// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License or the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License and a copy of the GNU General Public License along with
+// Eigen. If not, see <http://www.gnu.org/licenses/>.
+
+#include "sparse_solver.h"
+
+#include <Eigen/CholmodSupport>
+
+template<typename T> void test_cholmod_T()
+{
+  CholmodDecomposition<SparseMatrix<T>, Lower> chol_colmajor_lower; chol_colmajor_lower.setMode(CholmodSupernodalLLt);
+  CholmodDecomposition<SparseMatrix<T>, Upper> chol_colmajor_upper; chol_colmajor_upper.setMode(CholmodSupernodalLLt);
+  CholmodDecomposition<SparseMatrix<T>, Lower> llt_colmajor_lower;  llt_colmajor_lower.setMode(CholmodSimplicialLLt);
+  CholmodDecomposition<SparseMatrix<T>, Upper> llt_colmajor_upper;  llt_colmajor_upper.setMode(CholmodSimplicialLLt);
+  CholmodDecomposition<SparseMatrix<T>, Lower> ldlt_colmajor_lower; ldlt_colmajor_lower.setMode(CholmodLDLt);
+  CholmodDecomposition<SparseMatrix<T>, Upper> ldlt_colmajor_upper; ldlt_colmajor_upper.setMode(CholmodLDLt);
+
+  check_sparse_spd_solving(chol_colmajor_lower);
+  check_sparse_spd_solving(chol_colmajor_upper);
+  check_sparse_spd_solving(llt_colmajor_lower);
+  check_sparse_spd_solving(llt_colmajor_upper);
+  check_sparse_spd_solving(ldlt_colmajor_lower);
+  check_sparse_spd_solving(ldlt_colmajor_upper);
+  
+//  check_sparse_spd_determinant(chol_colmajor_lower);
+//  check_sparse_spd_determinant(chol_colmajor_upper);
+//  check_sparse_spd_determinant(llt_colmajor_lower);
+//  check_sparse_spd_determinant(llt_colmajor_upper);
+//  check_sparse_spd_determinant(ldlt_colmajor_lower);
+//  check_sparse_spd_determinant(ldlt_colmajor_upper);
+}
+
+void test_cholmod_support()
+{
+  for(int i = 0; i < g_repeat; i++) {
+    CALL_SUBTEST_1(test_cholmod_T<double>());
+    CALL_SUBTEST_2(test_cholmod_T<std::complex<double> >());
+  }
+}
diff --git a/test/superlu_support.cpp b/test/superlu_support.cpp
index e54d72c1c..dbabaf2e1 100644
--- a/test/superlu_support.cpp
+++ b/test/superlu_support.cpp
@@ -24,9 +24,7 @@
 
 #include "sparse_solver.h"
 
-#ifdef EIGEN_SUPERLU_SUPPORT
 #include <Eigen/SuperLUSupport>
-#endif
 
 void test_superlu_support()
 {
diff --git a/test/umfpack_support.cpp b/test/umfpack_support.cpp
index 16f688302..6e459a922 100644
--- a/test/umfpack_support.cpp
+++ b/test/umfpack_support.cpp
@@ -24,9 +24,7 @@
 
 #include "sparse_solver.h"
 
-#ifdef EIGEN_UMFPACK_SUPPORT
 #include <Eigen/UmfPackSupport>
-#endif
 
 void test_umfpack_support()
 {