Update math/superlu_mt to version 3.1, along with some cleanups.

PR:		219265
Submitted by:	pfg

6 files changed, 52 insertions, 113 deletions

diff --git a/math/superlu_mt/files/patch-INSTALL-Makefile b/math/superlu_mt/files/patch-INSTALL-Makefile
index 354a0ce66850..429b7fd6ce24 100644
--- a/math/superlu_mt/files/patch-INSTALL-Makefile
+++ b/math/superlu_mt/files/patch-INSTALL-Makefile
@@ -1,6 +1,6 @@
---- INSTALL/Makefile.orig	2013-11-16 19:14:28.000000000 +0100
-+++ INSTALL/Makefile	2013-11-16 19:14:58.000000000 +0100
-@@ -17,7 +17,7 @@
+--- INSTALL/Makefile.orig	2013-03-19 22:10:40 UTC
++++ INSTALL/Makefile
+@@ -17,7 +17,7 @@ install.out:
  
  slamch.o: slamch.c ; $(CC) $(NOOPTS) -c $<
  dlamch.o: dlamch.c ; $(CC) $(NOOPTS) -c $<
diff --git a/math/superlu_mt/files/patch-SRC+slu_mt_util.h b/math/superlu_mt/files/patch-SRC+slu_mt_util.h
deleted file mode 100644
index daf2a8cf9bef..000000000000
--- a/math/superlu_mt/files/patch-SRC+slu_mt_util.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- SRC/slu_mt_util.h~	2008-01-09 08:28:56.000000000 +0900
-+++ SRC/slu_mt_util.h	2008-07-02 09:54:31.000000000 +0900
-@@ -12,6 +12,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <pthread.h>
- 
- /* Macros */
- #ifndef USER_ABORT
diff --git a/math/superlu_mt/files/patch-TESTING+pddrive.c b/math/superlu_mt/files/patch-TESTING+pddrive.c
deleted file mode 100644
index 52f92404b7e0..000000000000
--- a/math/superlu_mt/files/patch-TESTING+pddrive.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- TESTING/pddrive.c.orig	2008-06-18 22:06:40.000000000 -0500
-+++ TESTING/pddrive.c	2008-06-18 22:08:38.000000000 -0500
-@@ -9,6 +9,11 @@
- #define	FMT2      "%10s:fact=%d, trans=%d, refact=%d, equed=%d, n=%d, imat=%d, test(%d)=%12.5g\n"
- #define FMT3      "%10s:info=%d, izero=%d, n=%d, nrhs=%d, imat=%d, nfail=%d\n"
- 
-+/* SuperLU compatibility */
-+#define DN SLU_DN
-+#define _D SLU_D
-+#define GE SLU_GE
-+#define NC SLU_NC
- 
- main(int argc, char *argv[])
- {
diff --git a/math/superlu_mt/files/patch-TESTING+pdgssv.c b/math/superlu_mt/files/patch-TESTING+pdgssv.c
deleted file mode 100644
index 926ed0a98863..000000000000
--- a/math/superlu_mt/files/patch-TESTING+pdgssv.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- TESTING/pdgssv.c.orig	2008-06-18 22:09:01.000000000 -0500
-+++ TESTING/pdgssv.c	2008-06-18 22:10:18.000000000 -0500
-@@ -1,6 +1,13 @@
- #include "pdsp_defs.h"
- #include "util.h"
- 
-+/* SuperLU compatibility */
-+#define DN SLU_DN
-+#define _D SLU_D
-+#define GE SLU_GE
-+#define NC SLU_NC
-+#define NR SLU_NR
-+
- void
- pdgssv(int nprocs, SuperMatrix *A, int *perm_c, int *perm_r, 
-        SuperMatrix *L, SuperMatrix *U, SuperMatrix *B, int *info )
diff --git a/math/superlu_mt/files/patch-TESTING+pdgssvx.c b/math/superlu_mt/files/patch-TESTING+pdgssvx.c
deleted file mode 100644
index 8a09843b89ff..000000000000
--- a/math/superlu_mt/files/patch-TESTING+pdgssvx.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- TESTING/pdgssvx.c.orig	2008-06-18 22:10:35.000000000 -0500
-+++ TESTING/pdgssvx.c	2008-06-18 22:11:10.000000000 -0500
-@@ -1,6 +1,13 @@
- #include "pdsp_defs.h"
- #include "util.h"
- 
-+/* SuperLU compatibility */
-+#define DN SLU_DN
-+#define _D SLU_D
-+#define GE SLU_GE
-+#define NC SLU_NC
-+#define NR SLU_NR
-+
- void
- pdgssvx(int nprocs, pdgstrf_options_t *pdgstrf_options, SuperMatrix *A, 
- 	int *perm_c, int *perm_r, equed_t *equed, double *R, double *C,
diff --git a/math/superlu_mt/files/patch-make.inc b/math/superlu_mt/files/patch-make.inc
index 23c7237fc353..9d88f8dfdd6d 100644
--- a/math/superlu_mt/files/patch-make.inc
+++ b/math/superlu_mt/files/patch-make.inc
@@ -1,62 +1,57 @@
---- make.inc.orig	2008-02-22 22:45:36 UTC
+--- make.inc.orig	2015-04-30 00:46:42 UTC
 +++ make.inc
-@@ -16,13 +16,13 @@
- #
- #  The machine (platform) identifier to append to the library names
- #
--PLAT = _sp
-+PLAT = _PTHREAD
- 
- #
- #  The name of the libraries to be created/linked to
- #
--TMGLIB       = libtmglib.a
--SUPERLULIB   = libsuperlu_mt$(PLAT).a
-+TMGLIB       = libtmg.a
-+SUPERLULIB   = libsuperlu_mt.a
- 
- # 
- # If you don't have ESSL, you can use the following blaslib instead:
-@@ -30,7 +30,7 @@ SUPERLULIB   = libsuperlu_mt$(PLAT).a
- # which may be slower than ESSL
- #
- BLASDEF	  = -DUSE_VENDOR_BLAS
--BLASLIB   = -lessl
-+BLASLIB   = %%BLAS%%
- #BLASLIB   = ../lib/libblas$(PLAT).a
- MATHLIB	  = -lm 
- MPLIB	  = -lpthread
-@@ -38,7 +38,7 @@ MPLIB	  = -lpthread
+@@ -22,7 +22,7 @@ PLAT = _PTHREAD
+ TMGLIB       	= libtmglib$(PLAT).a
+ SUPERLULIB   	= libsuperlu_mt$(PLAT).a
+ BLASDEF	        = -DUSE_VENDOR_BLAS
+-BLASLIB		= -L/usr/lib -lf77blas -latlas
++BLASLIB		= %%BLAS%%
+ #BLASLIB = ../lib/libblas$(PLAT).a
+ MATHLIB		= -lm 
+ MPLIB		= -lpthread
+@@ -31,7 +31,7 @@ MPLIB		= -lpthread
  #  The archiver and the flag(s) to use when building archive (library)
  #  If your system has no ranlib, set RANLIB = echo.
  #
--ARCH         = ar
-+ARCMD        = ar
- ARCHFLAGS    = cr
- RANLIB       = ranlib
+-ARCH          	= ar
++ARCMD          	= ar
+ ARCHFLAGS     	= cr
+ RANLIB       	= ranlib
  
-@@ -46,16 +46,17 @@ RANLIB       = ranlib
- PREDEFS      	= -D_PTHREAD
- #
+@@ -40,8 +40,8 @@ RANLIB       	= ranlib
+ # Definitions used by CPP:
+ PREDEFS      	= -D__PTHREAD  ## -DDEBUGlevel=0 -DPRNTlevel=0
+ #
+-CC           	= gcc
+-CFLAGS       	= $(PREDEFS) -g #-O3
++CC           	= %%CC%%
++CFLAGS       	= $(PREDEFS) %%CFLAGS%%
+ # Uncomment the following to use 64-bit integer
+ CFLAGS          += -D_LONGINT
  
--CC           = xlc_r
--CFLAGS       = -qarch=pwr5 -qalias=allptrs $(PREDEFS) -DPRNTlevel=0 -O3
--FORTRAN	     = xlf
--FFLAGS       = -O3 -qarch=pwr5
--LOADER       = xlc_r
--LOADOPTS     = -bmaxdata:0x80000000
-+CC           = %%CC%%
-+CFLAGS       = $(PREDEFS) %%CPPFLAGS%% %%CFLAGS%%
-+FORTRAN      = %%FC%%
-+FFLAGS       = %%FFLAGS%%
-+LOADER       = %%CC%%
-+LOADOPTS     = %%LDFLAGS%%
-+NOOPTS       = %%FPIC%%
- #
- #  C preprocessor defs for compilation for the Fortran interface
- #  (-DNoChange, -DAdd_, -DAdd__, or -DUpCase)
- #
--CDEFS        = -DNoChange
-+CDEFS        = -DAdd_
+@@ -49,19 +49,19 @@ CFLAGS          += -D_LONGINT
+ # There are a few files that should NOT be optimized, which appear in the
+ # end of SRC/Makefile, taking the flag $(NOOPTS)
+ # NOOPTS should be defined to explicitly turn off any optimization.
+-NOOPTS	     	= -O0
++NOOPTS	     	= -O0 %%FPIC%%
+ 
+-BLASOPTS	=
++BLASOPTS	= 
+ 
+ ############################################################################
  
+-FORTRAN		= gfortran
+-FFLAGS		= -O -fdefault-integer-8
++FORTRAN		= %%FC%%
++FFLAGS		= %%FFLAGS%% -fdefault-integer-8
  
+ ############################################################################
+ 
+-LOADER       	= gcc
+-LOADOPTS     	= -O #-pthread
++LOADER       	= %%CC%%
++LOADOPTS     	= -O %%LDFLAGS%%
+ 
+ ############################################################################
+ #