Index: head/math/blacs/Makefile =================================================================== --- head/math/blacs/Makefile (revision 566985) +++ head/math/blacs/Makefile (revision 566986) @@ -1,128 +1,128 @@ # Created by: NAKATA, Maho # $FreeBSD$ PORTNAME= blacs PORTVERSION= 1.7 PORTREVISION= 38 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= BLACS (Basic Linear Algebra Communication Subprograms) # See http://icl.cs.utk.edu/lapack-forum/archives/lapack/msg01200.html LICENSE= BSD3CLAUSE SUB_FILES= pkg-message USES= fortran gmake localbase USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS OPTIONS_RADIO= MPI OPTIONS_RADIO_MPI= MPICH OPENMPI OPTIONS_DEFAULT= DOCS MPICH DOCS_DISTFILES= blacs_install.ps f77blacsqref.ps lawn94.ps \ cblacsqref.ps mpi_prop.ps mpiblacs_issues.ps -OPENMPI_LIB_DEPENDS= libmpi.so:net/openmpi +OPENMPI_USES= mpi:openmpi OPENMPI_EXTRA_PATCHES= ${FILESDIR}/Bmake.inc-openmpi.diff -MPICH_LIB_DEPENDS= libmpi.so:net/mpich +MPICH_USES= mpi:mpich MPICH_EXTRA_PATCHES= ${FILESDIR}/Bmake.inc-mpich.diff .include F77EXTRAFLAGS= #-w -fno-globals -fugly-complex .if ${GCC_DEFAULT} >= 10 # workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-1) F77EXTRAFLAGS+= -fallow-argument-mismatch .endif 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/pkg-message.in =================================================================== --- head/math/blacs/files/pkg-message.in (revision 566985) +++ head/math/blacs/files/pkg-message.in (revision 566986) @@ -1,23 +1,23 @@ [ { type: install message: < pre-configure: .if ${CHOSEN_COMPILER_TYPE} == clang ${FIND} ${WRKSRC} -name Makefile.in | \ ${XARGS} ${REINPLACE_CMD} -e 's|-lstdc++|-lc++|' .endif .for s in check_gen.cpp check_gen_simple.cpp ${FIND} ${WRKSRC} -name ${s} | \ ${XARGS} ${REINPLACE_CMD} -e 's|using namespace std;||' .endfor post-stage: (cd ${STAGEDIR}${PREFIX}/share && \ ${RM} .insertlib gencheck gentime insertlib) (cd ${STAGEDIR}${PREFIX}/bin && ${RM} ${ASCII_TEXTS}) post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/EXAMPLES && \ ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) (cd ${STAGEDIR}${EXAMPLESDIR} && ${RM} -r .deps) .if !defined(WITH_DEBUG) ${FIND} ${STAGEDIR}${EXAMPLESDIR} -name "*.sprng" | \ ${XARGS} ${STRIP_CMD} .endif .include Index: head/math/sprng/pkg-plist =================================================================== --- head/math/sprng/pkg-plist (revision 566985) +++ head/math/sprng/pkg-plist (revision 566986) @@ -1,93 +1,93 @@ -%%MPI%%bin/2streams_mpi.tmp +%%MPICH%%bin/2streams_mpi.tmp bin/FIPS_140_2.tmp bin/alphabit.tmp bin/bigCrush.tmp bin/check.ccmrg bin/check.clcg bin/check.clcg64 bin/check.clfg bin/check.cmlfg bin/check.cpmlcg bin/check.fcmrg bin/check.flcg bin/check.flfg bin/check.fmlfg bin/check.fpmlcg bin/check_sim.ccmrg bin/check_sim.clcg bin/check_sim.clcg64 bin/check_sim.clfg bin/check_sim.cmlfg bin/check_sim.cpmlcg bin/check_sim.fcmrg bin/check_sim.flcg bin/check_sim.flfg bin/check_sim.fmlfg bin/check_sim.fpmlcg bin/collisions.tmp bin/convert.tmp bin/convertf.tmp bin/coupon.tmp bin/crush.tmp bin/equidist.tmp -%%MPI%%bin/fsprng-simple_mpi.tmp -%%MPI%%bin/fsprng_mpi.tmp +%%MPICH%%bin/fsprng-simple_mpi.tmp +%%MPICH%%bin/fsprng_mpi.tmp bin/gap.tmp bin/libsprng.a bin/maxt.tmp -%%MPI%%bin/message-simple_mpi.tmp -%%MPI%%bin/message_mpi.tmp +%%MPICH%%bin/message-simple_mpi.tmp +%%MPICH%%bin/message_mpi.tmp bin/metropolis.tmp bin/perm.tmp bin/pi-simple.tmp -%%MPI%%bin/pi-simple_mpi.tmp +%%MPICH%%bin/pi-simple_mpi.tmp bin/pif-simple.tmp bin/poker.tmp bin/rabbit.tmp bin/random_walk.tmp bin/runs.tmp bin/seed-simple.tmp -%%MPI%%bin/seed-simple_mpi.tmp +%%MPICH%%bin/seed-simple_mpi.tmp bin/seed.tmp -%%MPI%%bin/seed_mpi.tmp +%%MPICH%%bin/seed_mpi.tmp bin/seedf-simple.tmp bin/seedf.tmp bin/serial.tmp bin/simple-simple.tmp bin/simplef-simple.tmp bin/smallCrush.tmp bin/spawn.tmp bin/spawnf.tmp bin/sprng-simple.tmp -%%MPI%%bin/sprng-simple_mpi.tmp +%%MPICH%%bin/sprng-simple_mpi.tmp bin/sprng.tmp -%%MPI%%bin/sprng_mpi.tmp +%%MPICH%%bin/sprng_mpi.tmp bin/sprngf-simple.tmp bin/sprngf.tmp bin/subroutinef.tmp bin/sum.tmp bin/time.ccmrg bin/time.clcg bin/time.clcg64 bin/time.clfg bin/time.cmlfg bin/time.cpmlcg bin/time.fcmrg bin/time.flcg bin/time.flfg bin/time.fmlfg bin/time.fpmlcg bin/wolff.tmp bin/wolffind.tmp bin/wolfftest.tmp include/bignum.h include/cmrg.h include/lcg.h include/lcg64.h include/lfg.h include/mlfg.h include/pmlcg.h include/sprng.h include/sprng_cpp.h include/sprng_f.h lib/libsprng.a Index: head/science/code_saturne/Makefile =================================================================== --- head/science/code_saturne/Makefile (revision 566985) +++ head/science/code_saturne/Makefile (revision 566986) @@ -1,118 +1,118 @@ # Created by: thierry@pompo.net # $FreeBSD$ PORTNAME= code_saturne PORTVERSION= 6.1.3 DISTVERSIONPREFIX= v CATEGORIES= science parallel MAINTAINER= thierry@FreeBSD.org COMMENT= EDF's general purpose Computational Fluid Dynamics (CFD) software LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gsed:textproc/gsed LIB_DEPENDS= libsysinfo.so:devel/libsysinfo \ libcgns.so:science/cgnslib \ libhdf5.so:science/hdf5 \ libmedC.so:french/med RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ xmgrace:math/grace \ bash:shells/bash \ xterm:x11/xterm USE_GITHUB= yes GH_ACCOUNT= code-saturne USES= autoreconf bison compiler:c11 fortran gettext gnome gmake \ iconv libtool pyqt:5 python:3.6+ shebangfix USE_GNOME= libxml2 USE_PYQT= core gui sip widgets xml_build SHEBANG_FILES= install_saturne.py tests/unittests.py bin/*.py build-aux/*.py CFLAGS+= -D__XSI_VISIBLE CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-salome --without-salome-yacs --without-salome-kernel \ --without-salome-gui --enable-python CONFIGURE_ENV= ac_cv_path_SED=${LOCALBASE}/bin/gsed USE_LDCONFIG= yes INSTALL_TARGET= install-strip BINARY_ALIAS= python=${PYTHON_CMD} \ pyrcc5=pyrcc5-${PYTHON_VER} \ pyuic5=pyuic5-${PYTHON_VER} -OPTIONS_DEFINE= DOCS EXAMPLES BATCH BLAS MPI SCOTCH -OPTIONS_DEFAULT= BATCH BLAS MPI SCOTCH METIS +OPTIONS_DEFINE= DOCS EXAMPLES BATCH BLAS MPICH SCOTCH +OPTIONS_DEFAULT= BATCH BLAS MPICH SCOTCH METIS OPTIONS_RADIO= METIS OPTIONS_RADIO_METIS= METIS PARMETIS BLAS_DESC= Support of OpenBLAS BLAS_USES= blaslapack BLAS_CONFIGURE_ON= --with-blas=yes --with-blas-lib=${LOCALBASE}/lib --with-blas-libs=-lopenblas BLAS_LIB_DEPENDS= libopenblas.so:math/openblas BATCH_DESC= Use Torque to submit batches BATCH_RUN_DEPENDS= pbs-config:sysutils/torque -MPI_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR} -MPI_LIB_DEPENDS= libmpi.so:net/mpich -MPI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR} -MPI_CONFIGURE_WITH= mpi +MPICH_USES= mpi +MPICH_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR} +MPICH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR} +MPICH_CONFIGURE_WITH= mpi METIS_DESC= Support of METIS METIS_LIB_DEPENDS= libmetis.so:math/metis METIS_CONFIGURE_ON= --with-metis-include="${LOCALBASE}/include" PARMETIS_DESC= Support of ParMETIS PARMETIS_LIB_DEPENDS= libparmetis.so:math/parmetis PARMETIS_CONFIGURE_ON= --with-metis-include="${LOCALBASE}/include/parmetis" \ --with-metis-lib="${LOCALBASE}/lib/parmetis" PARMETIS_CONFIGURE_ENV= LIBS=-lexecinfo SCOTCH_DESC= Support of Scotch SCOTCH_LIB_DEPENDS= libscotch.so:cad/scotch SCOTCH_CONFIGURE_ON= --with-scotch-include="${LOCALBASE}/include" TEST_TARGET= check .if defined(PACKAGE_BUILDING) TERM= vt100 # Force for pointyhat to override su .else TERM?= vt100 # Default value needed for tput in jail or tinderbox .endif .include .if ${ARCH} == "i386" # /wrkdirs/usr/ports/science/code_saturne/work/code_saturne-5.3.0/src/apps/.libs # /libsaturne.so: # undefined reference to `__atomic_compare_exchange' CONFIGURE_ARGS+= --disable-openmp .endif .if ${PORT_OPTIONS:MDOCS} USE_TEX= tex:build BUILD_DEPENDS+= fig2dev:print/fig2dev \ doxygen:devel/doxygen \ dot:graphics/graphviz \ ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} BINARY_ALIAS+= sphinx-build=sphinx-build-${PYTHON_VER} ALL_TARGET= all pdf DOCS= AUTHORS ChangeLog README .endif pre-configure: ${FLEX} -o ${WRKSRC}/src/mei/mei_scanner.c ${WRKSRC}/src/mei/mei_scanner.l ${LOCALBASE}/bin/bison --defines=${WRKSRC}/src/mei/mei_parser.h \ -o ${WRKSRC}/src/mei/mei_parser.c ${WRKSRC}/src/mei/mei_parser.y ${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|' \ ${WRKSRC}/Makefile.am post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/code_saturne/cs_solver post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:C|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include