Attachment 167306 Details for Bug 207425 – Add options for LTO, OpenMP and BLAS/LAPACK of choice

[patch] Add options for LTO, OpenMP and BLAS/LAPACK of choice

R.optim.patch (text/plain), 2.96 KB, created by Fernando Herrero Carrón on 2016-02-22 21:46:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fernando Herrero Carrón

Created: 2016-02-22 21:46:23 UTC

Size: 2.96 KB

patch

obsolete

>diff -ruN math/R/Makefile math/R.new/Makefile
>--- math/R/Makefile	2016-02-13 09:55:29.713978728 +0100
>+++ math/R.new/Makefile	2016-02-21 15:57:20.096324250 +0100
>@@ -33,9 +33,27 @@
> 			SED="${LOCALBASE}/bin/gsed" \
> 			ac_cv_have_decl_powl=yes ac_cv_have_decl_log1pl=yes
> 
>-OPTIONS_DEFINE=		MISSING DOCS
>+OPTIONS_DEFINE=		MISSING DOCS LTO OPENMP
> 
> MISSING_DESC=		use libmissing rather than libquadmath
>+LTO_DESC=               Try to produce faster code through LTO
>+LTO_CONFIGURE_ENABLE=   lto
>+OPENMP_CONFIGURE_ENABLE= openmp
>+
>+OPTIONS_SINGLE=         BLAS
>+OPTIONS_SINGLE_BLAS= 	RBLAS ATLAS OPENBLAS NETLIB
>+OPTIONS_DEFAULT=     	OPENBLAS
>+
>+RBLAS_DESC=          	Use internal blas implementation (slow!)
>+
>+OPENBLAS_USES=  	blaslapack:openblas
>+NETLIB_USES=    	blaslapack:netlib
>+ATLAS_USES=     	blaslapack:atlas
>+RBLAS_CONFIGURE_ON= 	--without-blas --without-lapack
>+RBLAS_CONFIGURE_OFF= 	--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
>+                        --with-lapack="${LAPACKLIB}"
>+
>+OPTIONS_SUB=            RBLAS
> 
> .if defined(LIBRMATH_SLAVEPORT)
> BUILD_WRKSRC=		${WRKSRC}/src/nmath/standalone
>@@ -56,9 +74,8 @@
> CPPFLAGS+=		-I${LOCALBASE}/include
> LDFLAGS+=		-L${LOCALBASE}/lib
> 
>-OPTIONS_DEFINE+=	ATLAS ICU PCRE_PORT THREADS
>+OPTIONS_DEFINE+=	ICU PCRE_PORT THREADS
> 
>-ATLAS_DESC=		Use ATLAS instead of BLAS/LAPACK
> ICU_DESC=		Use ICU for collation in multibyte locales
> PCRE_PORT_DESC=		Use devel/pcre instead of the bundled PCRE
> 
>@@ -84,8 +101,8 @@
> TCLTK_DESC=		tcltk package
> X11_DESC=		X11() graphics device
> 
>-OPTIONS_DEFAULT+=	GHOSTSCRIPT INFO_MANUALS JPEG LIBR PANGOCAIRO PNG \
>-			TCLTK TIFF X11
>+OPTIONS_DEFAULT+=       GHOSTSCRIPT INFO_MANUALS JPEG LIBR LTO OPENMP \
>+			PANGOCAIRO PNG TCLTK TIFF X11
> 
> OPTIONS_DEFAULT_armv6+=		MISSING
> OPTIONS_DEFAULT_powerpc+=	MISSING
>@@ -143,20 +160,6 @@
> .endif
> 
> .if !defined(LIBRMATH_SLAVEPORT)
>-.if ${PORT_OPTIONS:MATLAS}
>-LIB_DEPENDS+=		libatlas.so:${PORTSDIR}/math/atlas
>-BLAS?=			${LIBM} -lf77blas
>-LAPACK?=		${LIBM} -lalapack -lcblas
>-.else
>-BLAS?=			no
>-LAPACK?=		no
>-.endif
>-CONFIGURE_ARGS+=	--with-blas="${BLAS}" --with-lapack="${LAPACK}"
>-.if ${BLAS} == "no" || ${LAPACK} == "no"
>-PLIST_SUB+=		LAPACK=""
>-.else
>-PLIST_SUB+=		LAPACK="@comment "
>-.endif
> 
> .if ${PORT_OPTIONS:MICU}
> LIB_DEPENDS+=		libicui18n.so:${PORTSDIR}/devel/icu
>diff -ruN math/R/pkg-plist math/R.new/pkg-plist
>--- math/R/pkg-plist	2015-10-27 09:21:25.000000000 +0100
>+++ math/R.new/pkg-plist	2016-02-21 16:26:16.909200110 +0100
>@@ -100,10 +100,10 @@
> lib/R/include/Rmath.h
> lib/R/include/Rversion.h
> lib/R/include/S.h
>-%%LAPACK%%lib/R/lib/libRblas.so
>-%%LAPACK%%lib/R/lib/libRblas.so.%%RBLAS_SOVERSION%%
>-%%LAPACK%%lib/R/lib/libRlapack.so
>-%%LAPACK%%lib/R/lib/libRlapack.so.%%RLAPACK_SOVERSION%%
>+%%RBLAS%%lib/R/lib/libRblas.so
>+%%RBLAS%%lib/R/lib/libRblas.so.%%RBLAS_SOVERSION%%
>+%%RBLAS%%lib/R/lib/libRlapack.so
>+%%RBLAS%%lib/R/lib/libRlapack.so.%%RLAPACK_SOVERSION%%
> %%LIBR%%lib/R/lib/libR.so
> %%LIBR%%lib/R/lib/libR.so.%%R_SOVERSION%%
> lib/R/library/KernSmooth/DESCRIPTION

Actions: View | Diff

Attachments on bug 207425: 167306 | 170792 | 171764