Index: head/math/blacs/Makefile =================================================================== --- head/math/blacs/Makefile (revision 531491) +++ head/math/blacs/Makefile (revision 531492) @@ -1,126 +1,120 @@ # Created by: NAKATA, Maho # $FreeBSD$ PORTNAME= blacs PORTVERSION= 1.7 -PORTREVISION= 35 +PORTREVISION= 36 CATEGORIES= math MASTER_SITES= NETLIB/blacs DISTNAME= BLACS DISTFILES= mpiblacs.tgz blacstester.tgz mpiblacs-patch03.tgz DIST_SUBDIR= blacs EXTRACT_ONLY= mpiblacs.tgz blacstester.tgz mpiblacs-patch03.tgz MAINTAINER= ports@FreeBSD.org -COMMENT= The BLACS (Basic Linear Algebra Communication Subprograms) +COMMENT= BLACS (Basic Linear Algebra Communication Subprograms) SUB_FILES= pkg-message USES= fortran gmake USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS +OPTIONS_RADIO= MPI +OPTIONS_RADIO_MPI= MPICH OPENMPI +OPTIONS_DEFAULT= DOCS MPICH -.include - -.if ! ${PORT_OPTIONS:MDOCS} -DISTFILES+= blacs_install.ps f77blacsqref.ps lawn94.ps \ +DOCS_DISTFILES= blacs_install.ps f77blacsqref.ps lawn94.ps \ cblacsqref.ps mpi_prop.ps mpiblacs_issues.ps -.endif -.if exists(${LOCALBASE}/mpi/openmpi/bin/mpirun) -WITH_OPENMPI= yes -.endif +OPENMPI_LIB_DEPENDS= libmpi.so:net/openmpi3 +OPENMPI_EXTRA_PATCHES= ${FILESDIR}/Bmake.inc-openmpi.diff -.if defined(WITH_OPENMPI) -BUILD_DEPENDS+= ${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi -RUN_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi -EXTRA_PATCHES+= ${FILESDIR}/Bmake.inc-openmpi.diff -.else -LIB_DEPENDS+= libmpich.so:net/mpich2 -EXTRA_PATCHES+= ${FILESDIR}/Bmake.inc-mpich.diff -.endif +MPICH_LIB_DEPENDS= libmpich.so:net/mpich2 +MPICH_EXTRA_PATCHES= ${FILESDIR}/Bmake.inc-mpich.diff + +.include F77EXTRAFLAGS= #-w -fno-globals -fugly-complex DEBUG_LEVEL= 0 .if ${ARCH} == "sparc64" || ${ARCH} == "amd64" FPIC= -fPIC .else FPIC= -fpic .endif WRKSRC_SHARED=${WRKSRC}_shared CFLAGS_SHARED=${CFLAGS} ${FPIC} FFLAGS_SHARED=${FFLAGS} ${FPIC} SVERSION=1 .if defined(WITH_OPTIMIZED_FLAGS) .if ${ARCH} == "amd64" FFLAGS+= -pipe -O3 -ffast-math -funroll-all-loops -fpeel-loops -ftracer -funswitch-loops -funit-at-a-time CFLAGS+= -pipe -O3 -ffast-math -funroll-all-loops -fpeel-loops -ftracer -funswitch-loops -funit-at-a-time .elif ${ARCH} == "i386" FFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3 CFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3 .else FFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar CFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar .endif .endif pre-patch: (${CP} ${WRKSRC}/BMAKES/Bmake.MPI-LINUX ${WRKSRC}/Bmake.inc) post-patch: ${CP} -r ${WRKSRC} ${WRKSRC_SHARED} pre-configure: (${REINPLACE_CMD} -e 's|@WRKSRC@|${WRKSRC}|g ; s|@DEBUG_LEVEL@|${DEBUG_LEVEL}|g ; s|@LOCALBASE@|${LOCALBASE}|g ; s|@CC@|${CC}|g ; s|@CFLAGS@|${CFLAGS}|g ; s|@F77@|${F77}|g ; s|@FFLAGS@|${FFLAGS}|g ; s|@F77EXTRAFLAGS@|${F77EXTRAFLAGS}|g ; s| ARCH *.= ar| ARCMD = ar|' ${WRKSRC}/Bmake.inc) (${REINPLACE_CMD} -e 's|@WRKSRC@|${WRKSRC_SHARED}|g ; s|@DEBUG_LEVEL@|${DEBUG_LEVEL}|g ; s|@LOCALBASE@|${LOCALBASE}|g ; s|@CC@|${CC}|g ; s|@CFLAGS@|${CFLAGS_SHARED}|g ; s|@F77@|${F77}|g ; s|@FFLAGS@|${FFLAGS_SHARED}|g ; s|@F77EXTRAFLAGS@|${F77EXTRAFLAGS}|g ; s| ARCH *.= ar| ARCMD = ar|' ${WRKSRC_SHARED}/Bmake.inc) ${REINPLACE_CMD} -e 's|\$$(ARCH)|$$(ARCMD)|' ${WRKSRC}/SRC/MPI/Makefile ${REINPLACE_CMD} -e 's|\$$(ARCH)|$$(ARCMD)|' ${WRKSRC_SHARED}/SRC/MPI/Makefile do-build: (cd ${WRKSRC}; make mpi; make tester) (cd ${WRKSRC_SHARED}; make mpi; make tester) post-build: ${RM} -r ${WRKDIR}/tmp_shared ${MKDIR} ${WRKDIR}/tmp_shared ${MV} ${WRKSRC_SHARED}/LIB/blacs_MPI-FreeBSD-${DEBUG_LEVEL}.a ${WRKSRC_SHARED}/LIB/libblacsc.a ${MV} ${WRKSRC_SHARED}/LIB/blacsF77init_MPI-FreeBSD-${DEBUG_LEVEL}.a ${WRKSRC_SHARED}/LIB/libblacsf77.a ${MV} ${WRKSRC_SHARED}/LIB/blacsCinit_MPI-FreeBSD-${DEBUG_LEVEL}.a ${WRKSRC_SHARED}/LIB/libblacs.a ${FIND} ${WRKSRC_SHARED} -name "*\.a" -exec ${MV} {} ${WRKDIR}/tmp_shared \; cd ${WRKDIR}/tmp_shared ; for i in `ls *.a | ${SED} 's/\.a//' `; do \ ${LD} -Bshareable -o $${i}.so.${SVERSION} -x -soname $${i}.so.${SVERSION} --whole-archive $${i}.a ;\ ${LN} -s $${i}.so.${SVERSION} $${i}.so ;\ done do-install: ${INSTALL_DATA} ${WRKSRC}/LIB/blacsCinit_MPI-FreeBSD-${DEBUG_LEVEL}.a ${STAGEDIR}${PREFIX}/lib/libblacsc.a ${INSTALL_DATA} ${WRKSRC}/LIB/blacsF77init_MPI-FreeBSD-${DEBUG_LEVEL}.a ${STAGEDIR}${PREFIX}/lib/libblacsf77.a ${INSTALL_DATA} ${WRKSRC}/LIB/blacs_MPI-FreeBSD-${DEBUG_LEVEL}.a ${STAGEDIR}${PREFIX}/lib/libblacs.a .for lib in libblacsc libblacsf77 libblacs ${INSTALL_LIB} ${WRKDIR}/tmp_shared/${lib}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/${lib}.so.${SVERSION} ${LN} -s ${lib}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/${lib}.so .endfor ${MKDIR} ${STAGEDIR}${PREFIX}/share/BLACS/TESTING ( cd ${WRKSRC_SHARED}/TESTING/EXE ; \ ${INSTALL_PROGRAM} xCbtest_MPI-FreeBSD-${DEBUG_LEVEL} ${STAGEDIR}${PREFIX}/share/BLACS/TESTING/xCbtest_MPI-FreeBSD; \ ${INSTALL_PROGRAM} xFbtest_MPI-FreeBSD-${DEBUG_LEVEL} ${STAGEDIR}${PREFIX}/share/BLACS/TESTING/xFbtest_MPI-FreeBSD; \ ${INSTALL_DATA} bsbr.dat ${STAGEDIR}${PREFIX}/share/BLACS/TESTING; \ ${INSTALL_DATA} bt.dat ${STAGEDIR}${PREFIX}/share/BLACS/TESTING; \ ${INSTALL_DATA} comb.dat ${STAGEDIR}${PREFIX}/share/BLACS/TESTING; \ ${INSTALL_DATA} sdrv.dat ${STAGEDIR}${PREFIX}/share/BLACS/TESTING) .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${CAT} ${DISTDIR}/${DIST_SUBDIR}/blacs_install.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/blacs_install.ps.gz ${CAT} ${DISTDIR}/${DIST_SUBDIR}/cblacsqref.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/cblacsqref.ps.gz ${CAT} ${DISTDIR}/${DIST_SUBDIR}/f77blacsqref.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/f77blacsqref.ps.gz ${CAT} ${DISTDIR}/${DIST_SUBDIR}/lawn94.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/lawn94.ps.gz ${CAT} ${DISTDIR}/${DIST_SUBDIR}/mpi_prop.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/mpi_prop.ps.gz ${CAT} ${DISTDIR}/${DIST_SUBDIR}/mpiblacs_issues.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/mpiblacs_issues.ps.gz .endif .include Index: head/math/blacs/files/Bmake.inc-openmpi.diff =================================================================== --- head/math/blacs/files/Bmake.inc-openmpi.diff (revision 531491) +++ head/math/blacs/files/Bmake.inc-openmpi.diff (revision 531492) @@ -1,85 +1,93 @@ ---- Bmake.inc.orig 2014-08-22 23:54:21.000000000 +0200 -+++ Bmake.inc 2014-08-22 23:55:10.000000000 +0200 +--- Bmake.inc.orig 2014-08-22 23:54:21.000000000 +0200 ++++ Bmake.inc 2014-08-22 23:55:10.000000000 +0200 @@ -13,7 +13,7 @@ # ----------------------------- # The top level BLACS directory # ----------------------------- - BTOPdir = $(HOME)/BLACS + BTOPdir = @WRKSRC@ # --------------------------------------------------------------------------- # The communication library your BLACS have been written for. @@ -32,14 +32,14 @@ # ------------------------------------------------------------- # The platform identifier to suffix to the end of library names # ------------------------------------------------------------- - PLAT = LINUX + PLAT = FreeBSD # ---------------------------------------------------------- # Name and location of the BLACS library. See section 2 for # details on BLACS debug level (BLACSDBGLVL). # ---------------------------------------------------------- BLACSdir = $(BTOPdir)/LIB - BLACSDBGLVL = 0 + BLACSDBGLVL = @DEBUG_LEVEL@ BLACSFINIT = $(BLACSdir)/blacsF77init_$(COMMLIB)-$(PLAT)-$(BLACSDBGLVL).a BLACSCINIT = $(BLACSdir)/blacsCinit_$(COMMLIB)-$(PLAT)-$(BLACSDBGLVL).a BLACSLIB = $(BLACSdir)/blacs_$(COMMLIB)-$(PLAT)-$(BLACSDBGLVL).a @@ -47,10 +47,10 @@ # ------------------------------------- # Name and location of the MPI library. # ------------------------------------- - MPIdir = /usr/local/mpich - MPILIBdir = $(MPIdir)/lib/ -+ MPIdir = @LOCALBASE@/mpi/openmpi ++ MPIdir = @LOCALBASE@/mpi/openmpi3 + MPILIBdir = MPIINCdir = $(MPIdir)/include - MPILIB = $(MPILIBdir)/libmpich.a + MPILIB = # ------------------------------------- # All libraries required by the tester. -@@ -86,7 +86,7 @@ +@@ -86,14 +86,14 @@ # The directory to find the required communication library include files, # if they are required by your system. # ----------------------------------------------------------------------- - SYSINC = -I$(MPIINCdir) + SYSINC = # --------------------------------------------------------------------------- # The Fortran 77 to C interface to be used. If you are unsure of the correct + # setting for your platform, compile and run BLACS/INSTALL/xintface. + # Choices are: Add_, NoChange, UpCase, or f77IsF2C. + # --------------------------------------------------------------------------- +- INTFACE = -Df77IsF2C ++ INTFACE = -DAdd_ + + # ------------------------------------------------------------------------ + # Allows the user to vary the topologies that the BLACS default topologies @@ -140,7 +140,7 @@ # If you know that your MPI uses the same handles for fortran and C # communicators, you can replace the empty macro definition below with # the macro definition on the following line. - TRANSCOMM = -DCSameF77 + TRANSCOMM = -DUseMpi2 # ----------------------------------------------------------------------- # TRANSCOMM = @@ -195,16 +195,15 @@ # optimization. This is the F77NO_OPTFLAG. The usage of the remaining # macros should be obvious from the names. #============================================================================= - F77 = g77 - F77NO_OPTFLAGS = - F77FLAGS = $(F77NO_OPTFLAGS) -O - F77LOADER = $(F77) - F77LOADFLAGS = - CC = gcc - CCFLAGS = -O4 - CCLOADER = $(CC) -+ F77 = @LOCALBASE@/mpi/openmpi/bin/mpif77 ++ F77 = @LOCALBASE@/mpi/openmpi3/bin/mpif77 + F77NO_OPTFLAGS = @F77EXTRAFLAGS@ + F77FLAGS = @FFLAGS@ -+ F77LOADER = @LOCALBASE@/mpi/openmpi/bin/mpif77 ++ F77LOADER = @LOCALBASE@/mpi/openmpi3/bin/mpif77 + F77LOADFLAGS = @FFLAGS@ -+ CC = @LOCALBASE@/mpi/openmpi/bin/mpicc ++ CC = @LOCALBASE@/mpi/openmpi3/bin/mpicc + CCFLAGS = @CFLAGS@ -+ CCLOADER = @LOCALBASE@/mpi/openmpi/bin/mpicc ++ CCLOADER = @LOCALBASE@/mpi/openmpi3/bin/mpicc CCLOADFLAGS = - # -------------------------------------------------------------------------- # The archiver and the flag(s) to use when building an archive (library). # Also the ranlib routine. If your system has no ranlib, set RANLIB = echo. Index: head/math/blacs/files/pkg-message.in =================================================================== --- head/math/blacs/files/pkg-message.in (revision 531491) +++ head/math/blacs/files/pkg-message.in (revision 531492) @@ -1,25 +1,25 @@ [ { type: install message: <