PaStiX support added, but not working

CMakeLists.txt

@@ -14,6 +14,20 @@ if (SUPERLU_FOUND)
 	INCLUDE_DIRECTORIES(${SUPERLU_INCLUDES})
 endif()
 
+find_package( PaSTiX )
+if ( PASTIX_FOUND )
+	message( STATUS "PaSTiX was found" )
+	add_compile_options(-DHAVE_PASTIX)
+	INCLUDE_DIRECTORIES(${PASTIX_INCLUDES})
+endif()
+
+find_package( Umfpack )
+if ( UMFPACK_FOUND )
+	message( STATUS "Umfpack was found" )
+	add_compile_options(-DHAVE_UMFPACK)
+	INCLUDE_DIRECTORIES(${UMFPACK_INCLUDES})
+endif()
+
 if ( LEMMA_VTK6_SUPPORT OR LEMMA_VTK7_SUPPORT OR LEMMA_VTK8_SUPPORT AND LEMMA_MODULE_EMSCHUR3D ) 
 
 	configure_file (
@@ -39,7 +53,16 @@ if ( LEMMA_VTK6_SUPPORT OR LEMMA_VTK7_SUPPORT OR LEMMA_VTK8_SUPPORT AND LEMMA_MO
 
 	# Linking
 	target_link_libraries(emschur3d ${VTK_LIBRARIES})
+if ( SUPERLU_FOUND )
 	target_link_libraries(emschur3d ${SUPERLU_LIBRARIES})
+endif()
+if ( PASTIX_FOUND )
+	target_link_libraries(emschur3d ${PASTIX_LIBRARIES})
+	target_link_libraries(emschur3d "blas" "metis" "scotch" "scotchmetis" "scotcherr" "scotcherrexit" "hwloc")
+endif()
+if ( UMFPACK_FOUND )
+	target_link_libraries(emschur3d ${UMFPACK_LIBRARIES})
+endif()
 
 	# Testing
 	if (LEMMA_ENABLE_TESTING)

examples/EMSchur3D.cpp

@@ -35,6 +35,16 @@ int main( int argc, char** argv ) {
     // SUPERLU
     auto EM3D = EMSchur3D< Eigen::SuperLU<Eigen::SparseMatrix<Complex, Eigen::ColMajor> > >::NewSP();
 
+    // Eigen built-in
+    //auto EM3D = EMSchur3D< Eigen::SparseLU<Eigen::SparseMatrix<Complex, Eigen::ColMajor> > >::NewSP();
+
+    // UmfPack
+    //auto EM3D = EMSchur3D< Eigen::UmfPackLU<Eigen::SparseMatrix<Complex, Eigen::ColMajor> > >::NewSP();
+
+    // PaStiX
+    //auto EM3D = EMSchur3D< Eigen::PastixLU<Eigen::SparseMatrix<Complex, Eigen::ColMajor>, true > >::NewSP();
+
+
     if (argc < 3) {
         std::cout << "EMSchur3D  <rgrid>  <1dmod> <3dmod>  <aemsurvey> " << std::endl;
         exit( EXIT_SUCCESS );

include/EMSchur3D.h

@@ -28,6 +28,15 @@
 #ifdef HAVE_SUPERLU
 #include "Eigen/SuperLUSupport"
 #endif
+
+#ifdef HAVE_UMFPACK
+#include <Eigen/UmfPackSupport>
+#endif
+
+#ifdef HAVE_PASTIX
+#include <Eigen/PaStiXSupport>
+#endif
+
 //#include "CSymSimplicialCholesky.h"
 
 namespace Lemma {
@@ -361,10 +370,9 @@ namespace Lemma {
         }
     }
 
-    #ifdef HAVE_SUPERLU
+#ifdef HAVE_SUPERLU
     template<>
     void EMSchur3D< Eigen::SuperLU<Eigen::SparseMatrix<Complex, Eigen::ColMajor> > >::BuildCDirectSolver() {
-
         CSolver = new Eigen::SuperLU<Eigen::SparseMatrix<Complex, Eigen::ColMajor> > [Omegas.size()];
 
         for (int iw=0; iw<Omegas.size(); ++iw) {
@@ -372,9 +380,10 @@ namespace Lemma {
             timer.begin();
 
             /* SuperLU */
-            CSolver[iw].options().DiagPivotThresh = 0.0;
+            // Recommended values for symmetric mode
+            CSolver[iw].options().DiagPivotThresh = 0.01;
             CSolver[iw].options().SymmetricMode = YES;
-            //CSolver[iw].options().ColPerm = MMD_AT_PLUS_A;
+            CSolver[iw].options().ColPerm = MMD_AT_PLUS_A;
             //CSolver[iw].options().Trans = NOTRANS;
             //CSolver[iw].options().ConditionNumber = NO;
             //std::cout << "SuperLU options:\n";
@@ -400,7 +409,7 @@ namespace Lemma {
 
         }
     }
-    #endif
+#endif
 
     template<>
     void EMSchur3D< Eigen::SparseLU<Eigen::SparseMatrix<Complex, Eigen::ColMajor>, Eigen::COLAMDOrdering<int> > >::BuildCDirectSolver() {
@@ -429,6 +438,39 @@ namespace Lemma {
         }
     }
 
+#ifdef HAVE_UMFPACK
+    // Umfpack only seems to work when LOWER and UPPER are set to 1. Workarounds this have not been found.
+    template<>
+    void EMSchur3D< Eigen::UmfPackLU<Eigen::SparseMatrix<Complex, Eigen::ColMajor> > >::BuildCDirectSolver() {
+        CSolver = new Eigen::UmfPackLU<Eigen::SparseMatrix<Complex, Eigen::ColMajor> > [Omegas.size()];
+        for (int iw=0; iw<Omegas.size(); ++iw) {
+            jsw_timer timer;
+            timer.begin();
+            /*  Complex system */
+            std::cout << "UmfPackLU pattern analyzing C_" << iw << ",";
+            std::cout.flush();
+
+            // Doesn't work, seg faults in solve
+            //Eigen::SparseMatrix<Complex> Csym = Cvec[iw].selfadjointView< Eigen::Lower >();
+
+            // Compiler errors get thrown with the view setting, good performance if LOWER and UPPER are set
+            // CSolver[iw].analyzePattern( Cvec[iw].selfadjointView< Eigen::Lower>() ); // Compiler error
+            CSolver[iw].analyzePattern( Cvec[iw] ); // requires LOWER=1 UPPER=1, double memory
+            // CSolver[iw].analyzePattern( Csym );     // seg faults
+            std::cout << " done in " << timer.end() / 60. << " [m]" << std::endl;
+
+            // factorize
+            timer.begin();
+            std::cout << "UmfPackLU factorising C_" << iw << ", ";
+            std::cout.flush();
+            // CSolver[iw].factorize( Cvec[iw].selfadjointView< Eigen::Lower>() );
+            CSolver[iw].factorize( Cvec[iw] );
+            // CSolver[iw].factorize( Csym );
+            std::cout << " done in " << timer.end() / 60. << " [m]" << std::endl;
+        }
+    }
+#endif
+
 //     template<>
 //     void EMSchur3D< Eigen::CholmodSupernodalLLT< Eigen::SparseMatrix<Complex, Eigen::ColMajor>, Eigen::Lower > > ::BuildCDirectSolver() {
 //         CSolver = new Eigen::CholmodSupernodalLLT< Eigen::SparseMatrix<Complex, Eigen::ColMajor>, Eigen::Lower > [Omegas.size()];
@@ -668,28 +710,33 @@ namespace Lemma {
 //         }
 //     }
 //
-//     template<>
-//     void EMSchur3D<   Eigen::PastixLU<Eigen::SparseMatrix<Complex, Eigen::ColMajor>, true > > ::BuildCDirectSolver() {
-//         CSolver = new Eigen::PastixLU<Eigen::SparseMatrix<Complex, Eigen::ColMajor>, true > [Omegas.size()];
-//         //MPI_Init(NULL, NULL);
-//         for (int iw=0; iw<Omegas.size(); ++iw) {
-//             Csym = Cvec[iw].selfadjointView<Eigen::Lower>();
-//             jsw_timer timer;
-//             timer.begin();
-//             /*  Complex system */
-//             std::cout << "PaStiX LU pattern analyzing C_" << iw << ",";
-//             std::cout.flush();
-//             CSolver[iw].compute( Csym );
-//             std::cout << "PaStiX LU Done C_" << iw << std::endl;;
-// //             std::cout << " done in " << timer.end() / 60. << " [m]" << std::endl;
-// //             // factorize
-// //             timer.begin();
-// //             std::cout << "PaStiX LU factorising C_" << iw << ", ";
-// //             std::cout.flush();
-// //             CSolver[iw].factorize( Csym );
-// //             std::cout << " done in " << timer.end() / 60. << " [m]" << std::endl;
-//         }
-//     }
+
+#ifdef HAVE_PASTIX
+    template<>
+    void EMSchur3D<   Eigen::PastixLU<Eigen::SparseMatrix<Complex, Eigen::ColMajor>, true > > ::BuildCDirectSolver() {
+        CSolver = new Eigen::PastixLU<Eigen::SparseMatrix<Complex, Eigen::ColMajor>, true > [Omegas.size()];
+
+        for (int iw=0; iw<Omegas.size(); ++iw) {
+            jsw_timer timer;
+            timer.begin();
+            /*  Complex system */
+            std::cout << "PastixLU pattern analyzing C_" << iw << ",";
+            std::cout.flush();
+            CSolver[iw].analyzePattern( Cvec[iw].selfadjointView< Eigen::Lower>() );
+            //CSolver[iw].analyzePattern( Cvec[iw] );
+            std::cout << " done in " << timer.end() / 60. << " [m]" << std::endl;
+
+            // factorize
+            timer.begin();
+            std::cout << "PastixLU factorising C_" << iw << ", ";
+            std::cout.flush();
+            CSolver[iw].factorize( Cvec[iw].selfadjointView< Eigen::Lower>() );
+            //CSolver[iw].factorize( Cvec[iw] );
+            std::cout << " done in " << timer.end() / 60. << " [m]" << std::endl;
+        }
+    }
+#endif
+
 
 }		// -----  end of Lemma  name  -----
 

include/EMSchur3DBase.h

@@ -44,26 +44,26 @@
 #include <Eigen/Sparse>
 //#include "bicgstab.h"
 
-// Solvers
-#ifdef HAVE_PASTIX
-#include <Eigen/PaStiXSupport>
-#endif
-
-#ifdef HAVE_METIS
-#include <Eigen/MetisSupport>
-#endif
-
-#ifdef HAVE_SUPERLU
-#include <Eigen/SuperLUSupport>
-#endif
-
-#ifdef HAVE_SUPERLUMT
-#include <Eigen/SuperLUMTSupport>
-#endif
-
-#ifdef HAVE_SPQR
-#include <Eigen/SPQRSupport>
-#endif
+// // Solvers
+// #ifdef HAVE_PASTIX
+// #include <Eigen/PaStiXSupport>
+// #endif
+//
+// #ifdef HAVE_METIS
+// #include <Eigen/MetisSupport>
+// #endif
+//
+// #ifdef HAVE_SUPERLU
+// #include <Eigen/SuperLUSupport>
+// #endif
+//
+// #ifdef HAVE_SUPERLUMT
+// #include <Eigen/SuperLUMTSupport>
+// #endif
+//
+// #ifdef HAVE_SPQR
+// #include <Eigen/SPQRSupport>
+// #endif
 
 // Cholmod Support won't compile typedef issue
 // #ifdef HAVE_CHOLMOD