Attachment #88045 for bug #124785

View | Details | Raw Unified | Return to bug 124785
Collapse All | Expand All

Lines 35-47 Link Here

(-)superlu_mt/Makefile (-1 / +9 lines)
35	.endif	35	.endif
36		36
37	WRKSRC= ${WRKDIR}/SuperLU_MT	37	WRKSRC= ${WRKDIR}/SuperLU_MT
38	ALL_TARGET= superlulib	38	ALL_TARGET= lib
39		39
40	ARCH2FIX= CBLAS/Makefile make.alpha make.exemplar TESTING/MATGEN/Makefile \	40	ARCH2FIX= CBLAS/Makefile make.alpha make.exemplar TESTING/MATGEN/Makefile \
41	make.origin make.inc make.pthreads SRC/Makefile	41	make.origin make.inc make.pthreads SRC/Makefile
42		42
43	post-patch:	43	post-patch:
44	@${REINPLACE_CMD} -e 's+%%BLAS_LIBS%%+-L${LOCALBASE}/lib ${BLAS_LIBS}+ ; \	44	@${REINPLACE_CMD} -e 's+%%BLAS_LIBS%%+-L${LOCALBASE}/lib ${BLAS_LIBS}+ ; \
		45	s+%%FORTRANLIBS%%+-L${LOCALBASE}/lib ${FORTRANLIBS}+; \
		46	s+%%CC%%+${CC}+; s+%%FC%%+${FC}+; \
		47	s+%%CFLAGS%%+${CFLAGS}+; \
		48	s+%%FFLAGS%%+${FFLAGS}+; \
45	s+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+ ; \	49	s+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+ ; \
46	s+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+ ' \	50	s+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+ ' \
47	${WRKSRC}/make.inc	51	${WRKSRC}/make.inc
Lines 61-64 Link Here
61	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/simax97.ps.gz ${DOCSDIR}	65	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/simax97.ps.gz ${DOCSDIR}
62	.endif	66	.endif
63		67
		68	regression-test: build
		69	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} testing)
		70	@(cd ${WRKSRC}/TESTING && ./plintstd pdtest.csh)
		71
64	.include <bsd.port.mk>	72	.include <bsd.port.mk>

Line 0 Link Here

(-)superlu_mt/files/patch-TESTING+pddrive.c (+14 lines)
	1	--- TESTING/pddrive.c.orig 2008-06-18 22:06:40.000000000 -0500
	2	+++ TESTING/pddrive.c 2008-06-18 22:08:38.000000000 -0500
	3	@@ -9,6 +9,11 @@
	4	#define FMT2 "%10s:fact=%d, trans=%d, refact=%d, equed=%d, n=%d, imat=%d, test(%d)=%12.5g\n"
	5	#define FMT3 "%10s:info=%d, izero=%d, n=%d, nrhs=%d, imat=%d, nfail=%d\n"
	6
	7	+/* SuperLU compatibility */
	8	+#define DN SLU_DN
	9	+#define _D SLU_D
	10	+#define GE SLU_GE
	11	+#define NC SLU_NC
	12
	13	main(int argc, char *argv[])
	14	{




--- 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 )




--- 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,




--- make.inc.orig	1999-09-02 15:47:13.000000000 -0500
+++ make.inc	2008-06-19 21:48:42.000000000 -0500
@@ -14,14 +14,15 @@
 #
 #  The machine (platform) identifier to append to the library names

+TMGLIB       	= libtmg.a
+SUPERLULIB   	= libsuperlu_mt.a
+BLASDEF		= -DUSE_VENDOR_BLAS
+BLASLIB     	= %%BLAS_LIBS%% %%FORTRANLIBS%%
 MATHLIB	     	= -lm 
-MPLIB		= -lthread
+MPLIB		= %%PTHREAD_LIBS%%

 
 # for Solaris 2.x
-CC	     	= cc
+CC	     	= %%CC%%
 #
 # Definitions used by CPP:
 PREDEFS      	= -D$(PLAT)
 #
-CFLAGS       	= $(PREDEFS) -xO3 -xcg92 $(DBG)
+CFLAGS       	= $(PREDEFS) %%CFLAGS%% %%PTHREAD_CFLAGS%%
 NOOPTS	     	=
 BLASOPTS	=
-LOADER       	= cc
+LOADER       	= %%FC%%
 LOADOPTS     	= -O
-FORTRAN		= f77
-FFLAGS		= -O
+FORTRAN		= %%FC%%
+FFLAGS		= %%FFLAGS%%
 
 #
 #  C preprocessor defs for compilation (-DNoChange, -DAdd_, or -DUpCase)

Return to bug 124785

Line 0 Link Here

(-)superlu_mt/files/patch-TESTING+pdgssv.c (+16 lines)
	1	--- TESTING/pdgssv.c.orig 2008-06-18 22:09:01.000000000 -0500
	2	+++ TESTING/pdgssv.c 2008-06-18 22:10:18.000000000 -0500
	3	@@ -1,6 +1,13 @@
	4	#include "pdsp_defs.h"
	5	#include "util.h"
	6
	7	+/* SuperLU compatibility */
	8	+#define DN SLU_DN
	9	+#define _D SLU_D
	10	+#define GE SLU_GE
	11	+#define NC SLU_NC
	12	+#define NR SLU_NR
	13	+
	14	void
	15	pdgssv(int nprocs, SuperMatrix A, int perm_c, int *perm_r,
	16	SuperMatrix L, SuperMatrix U, SuperMatrix B, int info )

Line 0 Link Here

(-)superlu_mt/files/patch-TESTING+pdgssvx.c (+16 lines)
	1	--- TESTING/pdgssvx.c.orig 2008-06-18 22:10:35.000000000 -0500
	2	+++ TESTING/pdgssvx.c 2008-06-18 22:11:10.000000000 -0500
	3	@@ -1,6 +1,13 @@
	4	#include "pdsp_defs.h"
	5	#include "util.h"
	6
	7	+/* SuperLU compatibility */
	8	+#define DN SLU_DN
	9	+#define _D SLU_D
	10	+#define GE SLU_GE
	11	+#define NC SLU_NC
	12	+#define NR SLU_NR
	13	+
	14	void
	15	pdgssvx(int nprocs, pdgstrf_options_t pdgstrf_options, SuperMatrix A,
	16	int perm_c, int perm_r, equed_t equed, double R, double *C,

Lines 1-5 Link Here

(-)superlu_mt/files/patch-make.inc (-8 / +9 lines)
1	--- make.inc.orig Thu Sep 2 15:47:13 1999	1	--- make.inc.orig 1999-09-02 15:47:13.000000000 -0500
2	+++ make.inc Tue May 27 19:32:12 2003	2	+++ make.inc 2008-06-19 21:48:42.000000000 -0500
3	@@ -14,14 +14,15 @@	3	@@ -14,14 +14,15 @@
4	#	4	#
5	# The machine (platform) identifier to append to the library names	5	# The machine (platform) identifier to append to the library names
Lines 14-20 Link Here
14	+TMGLIB = libtmg.a	14	+TMGLIB = libtmg.a
15	+SUPERLULIB = libsuperlu_mt.a	15	+SUPERLULIB = libsuperlu_mt.a
16	+BLASDEF = -DUSE_VENDOR_BLAS	16	+BLASDEF = -DUSE_VENDOR_BLAS
17	+BLASLIB = %%BLAS_LIBS%%	17	+BLASLIB = %%BLAS_LIBS%% %%FORTRANLIBS%%
18	MATHLIB = -lm	18	MATHLIB = -lm
19	-MPLIB = -lthread	19	-MPLIB = -lthread
20	+MPLIB = %%PTHREAD_LIBS%%	20	+MPLIB = %%PTHREAD_LIBS%%
Lines 26-46 Link Here
26		26
27	# for Solaris 2.x	27	# for Solaris 2.x
28	-CC = cc	28	-CC = cc
29	+CC ?= cc	29	+CC = %%CC%%
30	#	30	#
31	# Definitions used by CPP:	31	# Definitions used by CPP:
32	PREDEFS = -D$(PLAT)	32	PREDEFS = -D$(PLAT)
33	#	33	#
34	-CFLAGS = $(PREDEFS) -xO3 -xcg92 $(DBG)	34	-CFLAGS = $(PREDEFS) -xO3 -xcg92 $(DBG)
35	+CFLAGS += $(PREDEFS) %%PTHREAD_CFLAGS%%	35	+CFLAGS = $(PREDEFS) %%CFLAGS%% %%PTHREAD_CFLAGS%%
36	NOOPTS =	36	NOOPTS =
37	BLASOPTS =	37	BLASOPTS =
38	LOADER = cc	38	-LOADER = cc
		39	+LOADER = %%FC%%
39	LOADOPTS = -O	40	LOADOPTS = -O
40	-FORTRAN = f77	41	-FORTRAN = f77
41	-FFLAGS = -O	42	-FFLAGS = -O
42	+FORTRAN ?= f77	43	+FORTRAN = %%FC%%
43	+FFLAGS ?= -O	44	+FFLAGS = %%FFLAGS%%
44		45
45	#	46	#
46	# C preprocessor defs for compilation (-DNoChange, -DAdd_, or -DUpCase)	47	# C preprocessor defs for compilation (-DNoChange, -DAdd_, or -DUpCase)