Attachment 162174 Details for Bug 203847 – Patch for OpenMPI option including upgrade to 3.3.4

[patch] Patch for OpenMPI option including upgrade to 3.3.4

fftw_3.3.4_openmpi.patch (text/plain), 3.20 KB, created by Johannes M Dieterich on 2015-10-17 23:26:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes M Dieterich

Created: 2015-10-17 23:26:06 UTC

Size: 3.20 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 399603)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> #    $MCom: ports-experimental/math/fftw3/Makefile,v 1.1 2006/03/28 00:08:57 ahze Exp $
> 
> PORTNAME=	fftw3
>-PORTVERSION=	3.3.3
>+PORTVERSION=	3.3.4
> PORTREVISION?=	2
> CATEGORIES=	math
> MASTER_SITES=	http://www.fftw.org/ \
>@@ -16,7 +16,7 @@
> 
> LICENSE=	GPLv2
> 
>-#current flavors: default, float, long, and quad
>+#current flavors: default, float, long, mpi, and quad
> FFTW3_FLAVOR?=	default
> FFTW3_SUFX=
> 
>@@ -36,11 +36,13 @@
> INSTALL_TARGET=	install-pkgconfigDATA install-libLTLIBRARIES install-exec
> .endif
> 
>-OPTIONS_DEFINE=		G77_WRAPPERS OPENMP OPTIMIZED_CFLAGS
>+OPTIONS_DEFINE=		G77_WRAPPERS OPENMP OPTIMIZED_CFLAGS OPENMPI
> 
> G77_WRAPPERS_DESC=	Alter Fortran wrappers for use with g77
> OPENMP_DESC=		Build OpenMP multithreaded libraries
>+OPENMPI_DESC=		Build OpenMPI parallel libraries
> 
>+
> OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
> 
> .include <bsd.port.options.mk>
>@@ -55,6 +57,16 @@
> USES+=		compiler:env
> .endif
> 
>+.if ${PORT_OPTIONS:MOPENMPI}
>+PLIST_SUB+=     OPENMPI=""
>+LIB_DEPENDS+=		libmpi.so:${PORTSDIR}/net/openmpi
>+#BUILD_DEPENDS+=		mpicc:${PORTSDIR}/net/openmpi
>+CONFIGURE_ARGS+=        --enable-mpi
>+CONFIGURE_ENV+=		MPICC=${PREFIX}/mpi/openmpi/bin/mpicc
>+.else
>+PLIST_SUB+=     OPENMPI="@comment "
>+.endif
>+
> #Users must add altivec to MACHINE_CPU when desired:
> #this is not currently done in bsd.cpu.mk
> .if ${FFTW3_FLAVOR} == "default"
>Index: distinfo
>===================================================================
>--- distinfo	(revision 399603)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (fftw-3.3.3.tar.gz) = 85cdfc0a0ba10d8fa4f0f8e733aac1a5936c859832a9e3d5c0731fb5c54a97f3
>-SIZE (fftw-3.3.3.tar.gz) = 3920661
>+SHA256 (fftw-3.3.4.tar.gz) = 8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982
>+SIZE (fftw-3.3.4.tar.gz) = 3940427
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 399603)
>+++ pkg-plist	(working copy)
>@@ -2,21 +2,28 @@
> %%DEF%%bin/fftw-wisdom-to-conf
> %%DEF%%include/fftw3.f
> %%DEF%%include/fftw3.f03
>+%%OPENMPI%%include/fftw3-mpi.f03
> %%DEF%%include/fftw3.h
>+%%OPENMPI%%include/fftw3-mpi.h
> %%DEF%%include/fftw3l.f03
>+%%OPENMPI%%include/fftw3l.f03
> %%DEF%%include/fftw3q.f03
> lib/libfftw3%%FFTW3_SUFX%%.a
> lib/libfftw3%%FFTW3_SUFX%%.so
> lib/libfftw3%%FFTW3_SUFX%%.so.3
>-lib/libfftw3%%FFTW3_SUFX%%.so.3.3.2
>+lib/libfftw3%%FFTW3_SUFX%%.so.3.4.4
>+%%OPENMPI%%lib/libfftw3%%FFTW3_SUFX%%_mpi.a
>+%%OPENMPI%%lib/libfftw3%%FFTW3_SUFX%%_mpi.so
>+%%OPENMPI%%lib/libfftw3%%FFTW3_SUFX%%_mpi.so.3
>+%%OPENMPI%%lib/libfftw3%%FFTW3_SUFX%%_mpi.so.3.4.4
> %%OPENMP%%lib/libfftw3%%FFTW3_SUFX%%_omp.a
> %%OPENMP%%lib/libfftw3%%FFTW3_SUFX%%_omp.so
> %%OPENMP%%lib/libfftw3%%FFTW3_SUFX%%_omp.so.3
>-%%OPENMP%%lib/libfftw3%%FFTW3_SUFX%%_omp.so.3.3.2
>+%%OPENMP%%lib/libfftw3%%FFTW3_SUFX%%_omp.so.3.4.4
> lib/libfftw3%%FFTW3_SUFX%%_threads.a
> lib/libfftw3%%FFTW3_SUFX%%_threads.so
> lib/libfftw3%%FFTW3_SUFX%%_threads.so.3
>-lib/libfftw3%%FFTW3_SUFX%%_threads.so.3.3.2
>+lib/libfftw3%%FFTW3_SUFX%%_threads.so.3.4.4
> libdata/pkgconfig/fftw3%%FFTW3_SUFX%%.pc
> %%DEF%%man/man1/fftw-wisdom.1.gz
> %%DEF%%man/man1/fftw-wisdom-to-conf.1.gz

Actions: View | Diff

Attachments on bug 203847: 162174