Attachment #243847 for bug #272949

View | Details | Raw Unified | Return to bug 272949
Collapse All | Expand All

Lines 1080-1085 Link Here

(-)b/net/Makefile (+1 lines)
1080	SUBDIR += py-maxminddb	1080	SUBDIR += py-maxminddb
1081	SUBDIR += py-miniupnpc	1081	SUBDIR += py-miniupnpc
1082	SUBDIR += py-mpi4py	1082	SUBDIR += py-mpi4py
		1083	SUBDIR += py-mpi4py-mpich
1083	SUBDIR += py-msrplib	1084	SUBDIR += py-msrplib
1084	SUBDIR += py-ndg-httpsclient	1085	SUBDIR += py-ndg-httpsclient
1085	SUBDIR += py-netaddr	1086	SUBDIR += py-netaddr

Added Link Here

(-)b/net/py-mpi4py-mpich/Makefile (+11 lines)
1	PORTNAME= mpi4py
2
3	COMMENT= Python bindings for MPI (MPICH)
4
5	PKGNAMESUFFIX= -mpich
6
7	MASTERDIR= ${.CURDIR}/../py-mpi4py
8
9	MP= MPICH
10
11	.include "${MASTERDIR}/Makefile"




PORTNAME=	mpi4py
DISTVERSION=	3.1.4
PORTREVISION=	2
CATEGORIES=	net parallel python
MASTER_SITES=	PYPI
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	wen@FreeBSD.org
COMMENT?=	Python bindings for MPI (OpenMPI)
WWW=		https://github.com/mpi4py/mpi4py

LICENSE=	BSD2CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE.rst

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

MP?=		OPENMPI
MPICH_LDFLAGS=		${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so

.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=		*


	@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 <bsd.port.mk>
- 

Return to bug 272949

Lines 1-13 Link Here

(-)b/net/py-mpi4py/Makefile (-13 / +16 lines)
1	PORTNAME= mpi4py	1	PORTNAME= mpi4py
2	DISTVERSION= 3.1.4	2	DISTVERSION= 3.1.4
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= net parallel python	4	CATEGORIES= net parallel python
5	MASTER_SITES= PYPI	5	MASTER_SITES= PYPI
6	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	6	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
7		7
8	MAINTAINER= wen@FreeBSD.org	8	MAINTAINER= wen@FreeBSD.org
9	COMMENT= Python bindings for MPI	9	COMMENT?= Python bindings for MPI (OpenMPI)
10	WWW= https://bitbucket.org/mpi4py/mpi4py/	10	WWW= https://github.com/mpi4py/mpi4py
11		11
12	LICENSE= BSD2CLAUSE	12	LICENSE= BSD2CLAUSE
13	LICENSE_FILE= ${WRKSRC}/LICENSE.rst	13	LICENSE_FILE= ${WRKSRC}/LICENSE.rst
Lines 16-31 USES= python Link Here
16	USE_PYTHON= distutils cython autoplist concurrent	16	USE_PYTHON= distutils cython autoplist concurrent
17	LDFLAGS+= ${MPI_LIBS}	17	LDFLAGS+= ${MPI_LIBS}
18		18
		19	SLAVEDIRS= net/py-mpi4py-mpich
		20
19	OPTIONS_DEFINE= DOCS MANPAGES	21	OPTIONS_DEFINE= DOCS MANPAGES
20	OPTIONS_SINGLE= MP
21	OPTIONS_SINGLE_MP= MPICH OPENMPI
22	OPTIONS_DEFAULT= OPENMPI # the only non-failing MPI implementation
23	MP_DESC= MPI Implementation
24		22
25	MPICH_USES= fortran mpi:mpich	23	MP?= OPENMPI
26	MPICH_LDFLAGS= ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so
27		24
28	OPENMPI_USES= mpi:openmpi	25	.if ${MP} == "OPENMPI"
		26	USES+= mpi:openmpi
		27	CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}mpi4py-mpich-3*
		28	.elif ${MP} == "MPICH"
		29	USES+= fortran mpi:mpich
		30	LDFLAGS+= ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so
		31	CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}mpi4py-3*
		32	.else
		33	BROKEN= invalid parameter MP
		34	.endif
29		35
30	PORTDOCS= *	36	PORTDOCS= *
31		37
Lines 48-55 post-install: Link Here
48	@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	54	@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
49		55
50	do-test:	56	do-test:
51	# tests fail with MPICH2=on: https://bitbucket.org/mpi4py/mpi4py/issues/110/tests-fail-with-mpich2-on-freebsd-error
52	# tests fail with OPENMPI2=on: https://bitbucket.org/mpi4py/mpi4py/issues/109/tests-fail-with-openmpi2-on-freebsd
53	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test	57	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
54		58
55	.include <bsd.port.mk>	59	.include <bsd.port.mk>
56	-