From owner-svn-ports-head@freebsd.org Tue Mar 2 21:18:45 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7CE82550F7A; Tue, 2 Mar 2021 21:18:45 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DqqkF38mxz3N71; Tue, 2 Mar 2021 21:18:45 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5B4FF1DB2B; Tue, 2 Mar 2021 21:18:45 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 122LIjoE063305; Tue, 2 Mar 2021 21:18:45 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 122LIiiB063299; Tue, 2 Mar 2021 21:18:44 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <202103022118.122LIiiB063299@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Tue, 2 Mar 2021 21:18:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566986 - in head: math/blacs math/blacs/files math/sprng science/code_saturne X-SVN-Group: ports-head X-SVN-Commit-Author: thierry X-SVN-Commit-Paths: in head: math/blacs math/blacs/files math/sprng science/code_saturne X-SVN-Commit-Revision: 566986 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2021 21:18:45 -0000 Author: thierry Date: Tue Mar 2 21:18:43 2021 New Revision: 566986 URL: https://svnweb.freebsd.org/changeset/ports/566986 Log: Set USES=mpi. Modified: head/math/blacs/Makefile head/math/blacs/files/pkg-message.in head/math/sprng/Makefile head/math/sprng/pkg-plist head/science/code_saturne/Makefile Modified: head/math/blacs/Makefile ============================================================================== --- head/math/blacs/Makefile Tue Mar 2 21:17:39 2021 (r566985) +++ head/math/blacs/Makefile Tue Mar 2 21:18:43 2021 (r566986) @@ -29,10 +29,10 @@ 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 Modified: head/math/blacs/files/pkg-message.in ============================================================================== --- head/math/blacs/files/pkg-message.in Tue Mar 2 21:17:39 2021 (r566985) +++ head/math/blacs/files/pkg-message.in Tue Mar 2 21:18:43 2021 (r566986) @@ -11,8 +11,8 @@ Or, if you're using OpenMPI: % cd %%PREFIX%%/share/BLACS/TESTING - % LD_LIBRARY_PATH=%%LOCALBASE%%/mpi/openmpi3/lib/ export LD_LIBRARY_PATH - % PATH=$PATH:%%LOCALBASE%%/mpi/openmpi3/bin/ export PATH + % LD_LIBRARY_PATH=%%LOCALBASE%%/mpi/openmpi/lib/ export LD_LIBRARY_PATH + % PATH=$PATH:%%LOCALBASE%%/mpi/openmpi/bin/ export PATH % mpirun -np 4 ./xCbtest_MPI-FreeBSD % mpirun -np 4 ./xFbtest_MPI-FreeBSD Modified: head/math/sprng/Makefile ============================================================================== --- head/math/sprng/Makefile Tue Mar 2 21:17:39 2021 (r566985) +++ head/math/sprng/Makefile Tue Mar 2 21:18:43 2021 (r566986) @@ -27,11 +27,11 @@ TEST_TARGET= check PORTEXAMPLES= * -OPTIONS_DEFINE= EXAMPLES MPI -OPTIONS_DEFAULT= EXAMPLES MPI +OPTIONS_DEFINE= EXAMPLES MPICH +OPTIONS_DEFAULT= EXAMPLES MPICH OPTIONS_SUB= yes -MPI_LIB_DEPENDS= libmpi.so:net/mpich -MPI_CONFIGURE_WITH= mpi +MPICH_USES= mpi:mpich +MPICH_CONFIGURE_WITH= mpi ASCII_TEXTS= checkcmrg checklcg checklcg64 checklfg checkmlfg checkpmlcg \ checksprng timecmrg timelcg timelcg64 timelfg timemlfg timepmlcg\ Modified: head/math/sprng/pkg-plist ============================================================================== --- head/math/sprng/pkg-plist Tue Mar 2 21:17:39 2021 (r566985) +++ head/math/sprng/pkg-plist Tue Mar 2 21:18:43 2021 (r566986) @@ -1,4 +1,4 @@ -%%MPI%%bin/2streams_mpi.tmp +%%MPICH%%bin/2streams_mpi.tmp bin/FIPS_140_2.tmp bin/alphabit.tmp bin/bigCrush.tmp @@ -30,26 +30,26 @@ 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 @@ -59,9 +59,9 @@ 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 Modified: head/science/code_saturne/Makefile ============================================================================== --- head/science/code_saturne/Makefile Tue Mar 2 21:17:39 2021 (r566985) +++ head/science/code_saturne/Makefile Tue Mar 2 21:18:43 2021 (r566986) @@ -43,8 +43,8 @@ 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 @@ -53,10 +53,10 @@ BLAS_CONFIGURE_ON= --with-blas=yes --with-blas-lib=${L 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"