SuperLU5: Amesos, Ifpack ifguards added, Amesos warning silenced

SuperLU 5.1.1 also tested and added to list
ndellingwood · Nov 7, 2017 · 459f9c7 · 459f9c7
1 parent 71ef5e5
commit 459f9c7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/cmake/TPLs/FindTPLSuperLU.cmake b/cmake/TPLs/FindTPLSuperLU.cmake
@@ -56,13 +56,13 @@
 
 TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( SuperLU
   REQUIRED_HEADERS supermatrix.h slu_ddefs.h
-  REQUIRED_LIBS_NAMES "superlu superlu_3.0 superlu_4.0 superlu_4.1 superlu_4.2 superlu_4.3 superlu_5.0"
+  REQUIRED_LIBS_NAMES "superlu superlu_3.0 superlu_4.0 superlu_4.1 superlu_4.2 superlu_4.3 superlu_5.0 superlu_5.1.1"
   )
 
 include(CheckCSourceCompiles)
 include(MultilineSet)
 
-# API change in SuperLU 5.0 requires a 'GlobalLU_t' parameter for
+# API change in SuperLU 5.0 and 5.1 requires a 'GlobalLU_t' parameter for
 # *gssvx, *gsisx, *gstrf, and *gsitrf routines.  Check whether these
 # parameters are needed.
 

diff --git a/packages/amesos/src/Amesos_Superlu.cpp b/packages/amesos/src/Amesos_Superlu.cpp
@@ -55,7 +55,9 @@ class SLUData {
 #endif
   SLU::superlu_options_t SLU_options;
   SLU::mem_usage_t mem_usage;
+#ifdef HAVE_AMESOS_SUPERLU5_API
   SLU::GlobalLU_t lu;	     // Use for gssvx and gsisx in SuperLU 5.0
+#endif
   SLU::fact_t refactor_option ;         //  SamePattern or SamePattern_SameRowPerm
 
   SLUData() {
@@ -561,10 +563,12 @@ int Amesos_Superlu::Solve()
     int ierr;
     ierr = SerialX->ExtractView(&SerialXvalues, &SerialXlda);
     assert (ierr == 0);
+    AMESOS_CHK_ERR(ierr);
     assert (SerialXlda == NumGlobalRows_ ) ;
 
     ierr = SerialB->ExtractView(&SerialBvalues, &SerialBlda);
     assert (ierr == 0);
+    AMESOS_CHK_ERR(ierr);
     assert (SerialBlda == NumGlobalRows_ ) ;
 
     SLU::SuperMatrix& dataX = (data_->X) ;

diff --git a/packages/ifpack/src/Ifpack_SILU.h b/packages/ifpack/src/Ifpack_SILU.h
@@ -429,7 +429,9 @@ class Ifpack_SILU: public Ifpack_Preconditioner {
   //! Used for timing issues
   mutable Epetra_Time Time_;
   //! SuperLU global LU data
+#ifdef HAVE_IFPACK_SUPERLU5_API
   mutable GlobalLU_t lu_;
+#endif
   //! SuperLU stats
   mutable SuperLUStat_t stat_;
   //! SuperLU options