FreeBSD Bugzilla – Attachment 183024 Details for
Bug 219265
Update math/superlu_mt to version 3.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Update SuperLU_mt to version 3.1
math-superlu_mt.diff (text/plain), 12.48 KB, created by
Pedro F. Giffuni
on 2017-05-29 03:48:44 UTC
(
hide
)
Description:
Update SuperLU_mt to version 3.1
Filename:
MIME Type:
Creator:
Pedro F. Giffuni
Created:
2017-05-29 03:48:44 UTC
Size:
12.48 KB
patch
obsolete
>Index: math/superlu_mt/Makefile >=================================================================== >--- math/superlu_mt/Makefile (revision 441916) >+++ math/superlu_mt/Makefile (working copy) >@@ -2,12 +2,11 @@ > # $FreeBSD$ > > PORTNAME= superlu_mt >-PORTVERSION= 2.0.20080115 >-PORTREVISION= 9 >+PORTVERSION= 3.1.20160319 > CATEGORIES= math > MASTER_SITES= http://crd.lbl.gov/~xiaoye/SuperLU/ \ > http://crd.lbl.gov/~xiaoye/:doc >-DISTNAME= ${PORTNAME}_2.0 >+DISTNAME= ${PORTNAME}_3.1 > DISTFILES= ${DISTNAME}${EXTRACT_SUFX} simax97.ps.gz:doc > DIST_SUBDIR= superlu2 > EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} >@@ -15,7 +14,11 @@ > MAINTAINER= ports@FreeBSD.org > COMMENT= Routines for performing multithreaded sparse factorization > >+LICENSE= BSD3CLAUSE >+#LICENSE_FILE= ${WRKSRC}/License.txt >+ > BROKEN_aarch64= fails to build: undefined reference to sbrk >+BROKEN_sparc64= Does not link on sparc64 > > USES= fortran gmake > >@@ -54,16 +57,15 @@ > .endif > > USE_LDCONFIG= yes >-WRKSRC= ${WRKDIR}/SuperLU_MT_2.0 >-WRKSRC_SHARED= ${WRKDIR}/SuperLU_MT_2.0_shared >+WRKSRC= ${WRKDIR}/SuperLU_MT_3.1 >+WRKSRC_SHARED= ${WRKDIR}/SuperLU_MT_3.1_shared > ALL_TARGET= lib > SVERSION= 1 > > ARCH2FIX= CBLAS/Makefile MAKE_INC/make.openmp MAKE_INC/make.exemplar \ >- MAKE_INC/make.pthreads TESTING/MATGEN/Makefile \ >- make.inc SRC/Makefile >+ make.inc SRC/Makefile TESTING/MATGEN/Makefile > >-post-patch: >+do-configure: > .for fmk in ${ARCH2FIX} > @${REINPLACE_CMD} -e 's|^ARCH *.= ar|ARCMD = ar| ; \ > s|\$$(ARCH)|$$(ARCMD)|' ${WRKSRC}/${fmk} >@@ -106,9 +108,9 @@ > done > > do-install: >- ${INSTALL_DATA} ${WRKDIR}/tmp_static/libsuperlu_mt.a ${STAGEDIR}${PREFIX}/lib >- ${INSTALL_LIB} ${WRKDIR}/tmp_shared/libsuperlu_mt.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib >- cd ${STAGEDIR}${PREFIX}/lib && ${LN} -s -f libsuperlu_mt.so.${SVERSION} libsuperlu_mt.so >+ ${INSTALL_DATA} ${WRKDIR}/tmp_static/libsuperlu_mt_*.a ${STAGEDIR}${PREFIX}/lib >+ ${INSTALL_LIB} ${WRKDIR}/tmp_shared/libsuperlu_mt_*.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib >+ cd ${STAGEDIR}${PREFIX}/lib && ${LN} -s -f libsuperlu_mt_PTHREAD.so.${SVERSION} libsuperlu_mt_PTHREAD.so > ${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} > ${INSTALL_DATA} ${WRKSRC}/SRC/*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME} > .if ${PORT_OPTIONS:MDOCS} >@@ -118,8 +120,10 @@ > ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/simax97.ps.gz ${STAGEDIR}${DOCSDIR} > .endif > >+.ifdef MANTAINER_MODE > regression-test: do-build > @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} testing) > @(cd ${WRKSRC_SHARED} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} testing) >+.endif > > .include <bsd.port.post.mk> >Index: math/superlu_mt/distinfo >=================================================================== >--- math/superlu_mt/distinfo (revision 441916) >+++ math/superlu_mt/distinfo (working copy) >@@ -1,4 +1,5 @@ >-SHA256 (superlu2/superlu_mt_2.0.tar.gz) = 76f54f332db22313316798c3983b7bb704c159ce5a404ddda1f04d0fa477aab1 >-SIZE (superlu2/superlu_mt_2.0.tar.gz) = 1332773 >+TIMESTAMP = 1494706587 >+SHA256 (superlu2/superlu_mt_3.1.tar.gz) = 407b544b9a92b2ed536b1e713e80f986824cf3016657a4bfc2f3e7d2a76ecab6 >+SIZE (superlu2/superlu_mt_3.1.tar.gz) = 1824440 > SHA256 (superlu2/simax97.ps.gz) = 8f8ae10e28dfdeda2fed58b0bcec1bf96f10fa7b1d055aff160d77d7aeb8a983 > SIZE (superlu2/simax97.ps.gz) = 158724 >Index: math/superlu_mt/files/patch-INSTALL-Makefile >=================================================================== >--- math/superlu_mt/files/patch-INSTALL-Makefile (revision 441916) >+++ math/superlu_mt/files/patch-INSTALL-Makefile (working copy) >@@ -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 $< >Index: math/superlu_mt/files/patch-SRC+slu_mt_util.h >=================================================================== >--- math/superlu_mt/files/patch-SRC+slu_mt_util.h (revision 441916) >+++ math/superlu_mt/files/patch-SRC+slu_mt_util.h (nonexistent) >@@ -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 > >Property changes on: math/superlu_mt/files/patch-SRC+slu_mt_util.h >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: math/superlu_mt/files/patch-TESTING+pddrive.c >=================================================================== >--- math/superlu_mt/files/patch-TESTING+pddrive.c (revision 441916) >+++ math/superlu_mt/files/patch-TESTING+pddrive.c (nonexistent) >@@ -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[]) >- { > >Property changes on: math/superlu_mt/files/patch-TESTING+pddrive.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: math/superlu_mt/files/patch-TESTING+pdgssv.c >=================================================================== >--- math/superlu_mt/files/patch-TESTING+pdgssv.c (revision 441916) >+++ math/superlu_mt/files/patch-TESTING+pdgssv.c (nonexistent) >@@ -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 ) > >Property changes on: math/superlu_mt/files/patch-TESTING+pdgssv.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: math/superlu_mt/files/patch-TESTING+pdgssvx.c >=================================================================== >--- math/superlu_mt/files/patch-TESTING+pdgssvx.c (revision 441916) >+++ math/superlu_mt/files/patch-TESTING+pdgssvx.c (nonexistent) >@@ -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, > >Property changes on: math/superlu_mt/files/patch-TESTING+pdgssvx.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: math/superlu_mt/files/patch-make.inc >=================================================================== >--- math/superlu_mt/files/patch-make.inc (revision 441916) >+++ math/superlu_mt/files/patch-make.inc (working copy) >@@ -1,62 +1,48 @@ >---- 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 @@ >+@@ -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 >+@@ -40,8 +40,8 @@ RANLIB = ranlib >+ # Definitions used by CPP: >+ PREDEFS = -D__PTHREAD ## -DDEBUGlevel=0 -DPRNTlevel=0 > # >- # The machine (platform) identifier to append to the library names >- # >--PLAT = _sp >-+PLAT = _PTHREAD >+-CC = gcc >+-CFLAGS = $(PREDEFS) -g #-O3 >++CC = %%CC%% >++CFLAGS = $(PREDEFS) %%CFLAGS%% >+ # Uncomment the following to use 64-bit integer >+ CFLAGS += -D_LONGINT > >- # >- # 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 >+@@ -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%% > >- # >- # 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 >- # 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 >+-BLASOPTS = >++BLASOPTS = > >-@@ -46,16 +46,17 @@ RANLIB = ranlib >- PREDEFS = -D_PTHREAD >- # >+ ############################################################################ > >--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_ >+-FORTRAN = gfortran >+-FFLAGS = -O -fdefault-integer-8 >++FORTRAN = %%FC%% >++FFLAGS = %%FFLAGS%% -fdefault-integer-8 > >+ ############################################################################ > >+-LOADER = gcc >+-LOADOPTS = -O #-pthread >++LOADER = %%CC%% >++LOADOPTS = -O %%LDFLAGS%% >+ >+ ############################################################################ >+ # >Index: math/superlu_mt/pkg-descr >=================================================================== >--- math/superlu_mt/pkg-descr (revision 441916) >+++ math/superlu_mt/pkg-descr (working copy) >@@ -1,4 +1,4 @@ >- SuperLU_MT (version 2.0) >+ SuperLU_MT > ======================== > > SuperLU_MT contains a set of subroutines to solve a sparse linear system >Index: math/superlu_mt/pkg-plist >=================================================================== >--- math/superlu_mt/pkg-plist (revision 441916) >+++ math/superlu_mt/pkg-plist (working copy) >@@ -1,16 +1,16 @@ > include/superlu_mt/colamd.h >-include/superlu_mt/pcsp_defs.h >-include/superlu_mt/pdsp_defs.h >-include/superlu_mt/pssp_defs.h > include/superlu_mt/pxgstrf_synch.h >-include/superlu_mt/pzsp_defs.h > include/superlu_mt/slu_dcomplex.h > include/superlu_mt/slu_mt_Cnames.h >+include/superlu_mt/slu_mt_cdefs.h >+include/superlu_mt/slu_mt_ddefs.h > include/superlu_mt/slu_mt_machines.h >+include/superlu_mt/slu_mt_sdefs.h > include/superlu_mt/slu_mt_util.h >+include/superlu_mt/slu_mt_zdefs.h > include/superlu_mt/slu_scomplex.h > include/superlu_mt/supermatrix.h >-lib/libsuperlu_mt.a >-lib/libsuperlu_mt.so >-lib/libsuperlu_mt.so.1 >+lib/libsuperlu_mt_PTHREAD.a >+lib/libsuperlu_mt_PTHREAD.so >+lib/libsuperlu_mt_PTHREAD.so.1 > %%PORTDOCS%%%%DOCSDIR%%/simax97.ps.gz
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 219265
:
182577
|
182578
|
183023
|
183024
|
183039
|
183044
|
183412
|
183438