From nobody Sat Aug 05 08:31:51 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RHwmR3lsCz4Tpxx; Sat, 5 Aug 2023 08:31:51 +0000 (UTC) (envelope-from git@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 4RHwmR37BJz4pVb; Sat, 5 Aug 2023 08:31:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691224311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mWC6120mGXDXKBzufMT735c8Ae2If7At3fa4C+HVR1I=; b=ivvqPBRRrW3PZwmyeFFnJbu1PxcABYXLzhJ8tiMTNPT4JYpbXWcB9HVXrE65z+5Ng7kSno qgRay9LPoSJddARS49t6uWKVy4Kdpc6BVZlWRDK+spi2rPcZHzBHL+QB+lAUzmSJ6v+Sh4 B8i6dJlzgNlFm678PRlOBxaAwatFNjagCh65yFhf4El22DZGwHBSROwGUJqZuUlIllKY+7 d7BeuZlTJhAuwSD7y3WDcUBMHhoqs3AUy27fRUc2OpfjsoLOON7qDfIZ357hYTO7ALEVnZ VV+iTpxNTUM2c2Qi1gQSaBIQcyE9CqWZ1nt7kkYEhs+rcoNfXEfdKFIcIHgYyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691224311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mWC6120mGXDXKBzufMT735c8Ae2If7At3fa4C+HVR1I=; b=KjLHs0MOaNsTaHYgbBbxDlRGzYAhbtwAgsXhS80QKWIpSBwZZCO/pNYycvk1+3jWT77q0i cGumOz3NSWrKzel1YX9AmmF4mLJ9vRzy9wn+HT2XPLijmpTCVLnvyisg0CoPbmF7+mJcZL XD+qTrXQ51guo2GjwkVVWNL38JQ3uLCwnxFfEoBWQ/XP+a1oB+SaHCFsP68ti3jRNRm3fu vB/B/YKDxpyqvmE0Nq1yuf5wX6oD4+yWJihaZV+ROHh3gETeImxzqqFz3MiqQ/u/jEh2Bt Oe4O2d6K+VeO7gtIoEpFxQB7AQsMQSjDKwj6WxPk7+HZRx2qqPterYzf2bThGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691224311; a=rsa-sha256; cv=none; b=oUkSxCOhWFnbB+9fHaC3Q3FbhxUOE0iXiu6AwxY/Fd1fpx9UnZHpWZjUNocRHT6CznhT8g DHNVh/mn49iKpHlUr969ZtFkr91i+SKhoT67i6lN4rMq/zEbWZVTyVvZOhppER1w+cb0nd AYjemCQpmutYrRKJnbvkceaqkOFEuazTDl3AUoRiXh4hY4TG4Aw6hgF2gEJkWVlwZzj+k+ 4ZOhXyRWiRAQFfTo1MN2nWzQRG2sKH3gusITE0eMwCqQFyOV7sJxJndNVLRBUPJTxFIOFM Pxc0yv7KVFV/66jnTzGE409V5x+fR3AHeBfSjWmOuqh3aVjXWU1D6ac9QpSp0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHwmR29X4z7JQ; Sat, 5 Aug 2023 08:31:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3758Vplx040312; Sat, 5 Aug 2023 08:31:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3758VpKa040311; Sat, 5 Aug 2023 08:31:51 GMT (envelope-from git) Date: Sat, 5 Aug 2023 08:31:51 GMT Message-Id: <202308050831.3758VpKa040311@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 6d82be95de6c - main - net/py-mpi4py: add a slave port depending on MPICH List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d82be95de6c9dee7264b2b349823bd31a58e943 Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=6d82be95de6c9dee7264b2b349823bd31a58e943 commit 6d82be95de6c9dee7264b2b349823bd31a58e943 Author: Thierry Thomas AuthorDate: 2023-08-04 21:05:10 +0000 Commit: Thierry Thomas CommitDate: 2023-08-05 08:20:45 +0000 net/py-mpi4py: add a slave port depending on MPICH Sometimes we need mpi4py packaged against mpich, with Fortran enabled. Do not create a flavor, because there already exist flavors for Python versions, therefore a slave port seems more appropriate. Once committed, I shall add a line in Mk/Uses/mpi.mk to grab the right dependency according to the choice of MPI. Bump PORTVERSION for people using net/py-mpi4py built from ports with the non-default MPICH option. Also change WWW: the project on bitbucket has been archived. PR: 272949 Approved by: wen@ (maintainer) --- net/Makefile | 1 + net/py-mpi4py-mpich/Makefile | 11 +++++++++++ net/py-mpi4py/Makefile | 28 ++++++++++++++++------------ 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/net/Makefile b/net/Makefile index bd43587b6128..fb1d8cb18380 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1080,6 +1080,7 @@ SUBDIR += py-maxminddb SUBDIR += py-miniupnpc SUBDIR += py-mpi4py + SUBDIR += py-mpi4py-mpich SUBDIR += py-msrplib SUBDIR += py-ndg-httpsclient SUBDIR += py-netaddr diff --git a/net/py-mpi4py-mpich/Makefile b/net/py-mpi4py-mpich/Makefile new file mode 100644 index 000000000000..c1761bdc0868 --- /dev/null +++ b/net/py-mpi4py-mpich/Makefile @@ -0,0 +1,11 @@ +PORTNAME= mpi4py + +COMMENT= Python bindings for MPI (MPICH) + +PKGNAMESUFFIX= -mpich + +MASTERDIR= ${.CURDIR}/../py-mpi4py + +MP= MPICH + +.include "${MASTERDIR}/Makefile" diff --git a/net/py-mpi4py/Makefile b/net/py-mpi4py/Makefile index 681d48c1ed09..5c26ca7a2360 100644 --- a/net/py-mpi4py/Makefile +++ b/net/py-mpi4py/Makefile @@ -1,13 +1,13 @@ PORTNAME= mpi4py DISTVERSION= 3.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net parallel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= wen@FreeBSD.org -COMMENT= Python bindings for MPI -WWW= https://bitbucket.org/mpi4py/mpi4py/ +COMMENT?= Python bindings for MPI (OpenMPI) +WWW= https://github.com/mpi4py/mpi4py LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.rst @@ -16,16 +16,22 @@ USES= python USE_PYTHON= distutils cython autoplist concurrent LDFLAGS+= ${MPI_LIBS} +SLAVEDIRS= net/py-mpi4py-mpich + OPTIONS_DEFINE= DOCS MANPAGES -OPTIONS_SINGLE= MP -OPTIONS_SINGLE_MP= MPICH OPENMPI -OPTIONS_DEFAULT= OPENMPI # the only non-failing MPI implementation -MP_DESC= MPI Implementation -MPICH_USES= fortran mpi:mpich -MPICH_LDFLAGS= ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so +MP?= OPENMPI -OPENMPI_USES= mpi:openmpi +.if ${MP} == "OPENMPI" +USES+= mpi:openmpi +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}mpi4py-mpich-3* +.elif ${MP} == "MPICH" +USES+= fortran mpi:mpich +LDFLAGS+= ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}mpi4py-3* +.else +BROKEN= invalid parameter MP +.endif PORTDOCS= * @@ -48,8 +54,6 @@ post-install: @cd ${STAGEDIR}${PYTHON_SITELIBDIR}/mpi4py && ${STRIP_CMD} dl*.so MPI*.so lib-pmpi/libvt-hyb*.so lib-pmpi/libvt*.so lib-pmpi/libvt-mpi*.so lib-pmpi/libmpe*.so do-test: - # tests fail with MPICH2=on: https://bitbucket.org/mpi4py/mpi4py/issues/110/tests-fail-with-mpich2-on-freebsd-error - # tests fail with OPENMPI2=on: https://bitbucket.org/mpi4py/mpi4py/issues/109/tests-fail-with-openmpi2-on-freebsd @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test .include