Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] R: Use OpenBLAS where available
@ 2021-01-14  0:59 olafmersmann
  2021-01-14  1:00 ` [PR PATCH] [Updated] " olafmersmann
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: olafmersmann @ 2021-01-14  0:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 362 bytes --]

There is a new pull request by olafmersmann against master on the void-packages repository

https://github.com/olafmersmann/void-packages R
https://github.com/void-linux/void-packages/pull/27908

R: Use OpenBLAS where available
Also fixes building of manuals and checks.

A patch file from https://github.com/void-linux/void-packages/pull/27908.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-R-27908.patch --]
[-- Type: text/x-diff, Size: 2082 bytes --]

From a6100a633810442b347764b809d097b62e0114da Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sun, 10 Jan 2021 00:20:12 +0100
Subject: [PATCH] R: Use OpenBLAS where available

Also fixes building of manuals and checks.
---
 srcpkgs/R/template | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index def4ddaa50e..104a5a7b295 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,17 +1,21 @@
 # Template file for 'R'
 pkgname=R
 version=4.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
- --with-lapack --with-blas --enable-R-shlib --with-tcltk
+ --with-blas$(vopt_if openblas '="-lopenblas"') --with-lapack
+ --enable-R-shlib --with-tcltk
  --enable-memory-profiling
  LIBnn=lib"
 hostmakedepends="gcc-fortran pkg-config perl less which"
 makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel
  libpng-devel libjpeg-turbo-devel tiff-devel cairo-devel icu-devel
- lapack-devel blas-devel zlib-devel bzip2-devel pcre2-devel liblzma-devel
- libcurl-devel tcl-devel tk-devel libxml2-devel"
+ zlib-devel bzip2-devel pcre2-devel liblzma-devel
+ libcurl-devel tcl-devel tk-devel libxml2-devel
+ texlive texlive-fontsextra texinfo
+ $(vopt_if openblas openblas-devel 'blas-devel lapack-devel')"
+checkdepends="tzdata tar"
 depends="xdg-utils less which"
 short_desc="System for statistical computation and graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
@@ -23,6 +27,17 @@ checksum=09983a8a78d5fb6bc45d27b1c55f9ba5265f78fa54a55c13ae691f87c5bb9e0d
 nocross=yes
 shlib_provides="libR.so"
 
+build_options="openblas"
+desc_option_openblas="Enable support for openblas accelerated linear algebra"
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|aarch64*|armv[67]*|ppc64*)
+		# Prefer accelerated routines where available
+		build_options_default="openblas"
+		;;
+	*) ;;
+esac
+
 pre_configure() {
 	export R_BROWSER=/usr/bin/xdg-open
 	export R_PDFVIEWER=/usr/bin/xdg-open

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Updated] R: Use OpenBLAS where available
  2021-01-14  0:59 [PR PATCH] R: Use OpenBLAS where available olafmersmann
@ 2021-01-14  1:00 ` olafmersmann
  2021-01-21 22:21 ` olafmersmann
  2021-01-22  4:26 ` [PR PATCH] [Merged]: " ericonr
  2 siblings, 0 replies; 4+ messages in thread
From: olafmersmann @ 2021-01-14  1:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 367 bytes --]

There is an updated pull request by olafmersmann against master on the void-packages repository

https://github.com/olafmersmann/void-packages R
https://github.com/void-linux/void-packages/pull/27908

R: Use OpenBLAS where available
Also fixes building of manuals and checks.

A patch file from https://github.com/void-linux/void-packages/pull/27908.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-R-27908.patch --]
[-- Type: text/x-diff, Size: 2110 bytes --]

From d7fa9cac13c6700c0bc1ad3bd21b2fb8846c28e4 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sun, 10 Jan 2021 00:20:12 +0100
Subject: [PATCH] R: Use OpenBLAS where available

Also fixes building of manuals and checks.
---
 srcpkgs/R/template | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index def4ddaa50e..eb0befab4c0 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,18 +1,22 @@
 # Template file for 'R'
 pkgname=R
 version=4.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
- --with-lapack --with-blas --enable-R-shlib --with-tcltk
+ --with-blas$(vopt_if openblas '="-lopenblas"') --with-lapack
+ --enable-R-shlib --with-tcltk
  --enable-memory-profiling
  LIBnn=lib"
 hostmakedepends="gcc-fortran pkg-config perl less which"
 makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel
  libpng-devel libjpeg-turbo-devel tiff-devel cairo-devel icu-devel
- lapack-devel blas-devel zlib-devel bzip2-devel pcre2-devel liblzma-devel
- libcurl-devel tcl-devel tk-devel libxml2-devel"
+ zlib-devel bzip2-devel pcre2-devel liblzma-devel
+ libcurl-devel tcl-devel tk-devel libxml2-devel
+ texlive texlive-fontsextra texinfo
+ $(vopt_if openblas openblas-devel 'blas-devel lapack-devel')"
 depends="xdg-utils less which"
+checkdepends="tzdata tar"
 short_desc="System for statistical computation and graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
@@ -23,6 +27,17 @@ checksum=09983a8a78d5fb6bc45d27b1c55f9ba5265f78fa54a55c13ae691f87c5bb9e0d
 nocross=yes
 shlib_provides="libR.so"
 
+build_options="openblas"
+desc_option_openblas="Enable support for openblas accelerated linear algebra"
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|aarch64*|armv[67]*|ppc64*)
+		# Prefer accelerated routines where available
+		build_options_default="openblas"
+		;;
+	*) ;;
+esac
+
 pre_configure() {
 	export R_BROWSER=/usr/bin/xdg-open
 	export R_PDFVIEWER=/usr/bin/xdg-open

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Updated] R: Use OpenBLAS where available
  2021-01-14  0:59 [PR PATCH] R: Use OpenBLAS where available olafmersmann
  2021-01-14  1:00 ` [PR PATCH] [Updated] " olafmersmann
@ 2021-01-21 22:21 ` olafmersmann
  2021-01-22  4:26 ` [PR PATCH] [Merged]: " ericonr
  2 siblings, 0 replies; 4+ messages in thread
From: olafmersmann @ 2021-01-21 22:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 367 bytes --]

There is an updated pull request by olafmersmann against master on the void-packages repository

https://github.com/olafmersmann/void-packages R
https://github.com/void-linux/void-packages/pull/27908

R: Use OpenBLAS where available
Also fixes building of manuals and checks.

A patch file from https://github.com/void-linux/void-packages/pull/27908.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-R-27908.patch --]
[-- Type: text/x-diff, Size: 2303 bytes --]

From cdea21623b9b59959f88f4c6f5ce621dfc87e2aa Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sun, 10 Jan 2021 00:20:12 +0100
Subject: [PATCH] R: Use OpenBLAS where available

Also fixes building of manuals and checks.
---
 srcpkgs/R/template | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index def4ddaa50e..1ac1b9667a2 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,18 +1,22 @@
 # Template file for 'R'
 pkgname=R
 version=4.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
- --with-lapack --with-blas --enable-R-shlib --with-tcltk
+ --with-blas$(vopt_if openblas '="-lopenblas"') --with-lapack
+ --enable-R-shlib --with-tcltk
  --enable-memory-profiling
  LIBnn=lib"
 hostmakedepends="gcc-fortran pkg-config perl less which"
 makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel
  libpng-devel libjpeg-turbo-devel tiff-devel cairo-devel icu-devel
- lapack-devel blas-devel zlib-devel bzip2-devel pcre2-devel liblzma-devel
- libcurl-devel tcl-devel tk-devel libxml2-devel"
+ zlib-devel bzip2-devel pcre2-devel liblzma-devel
+ libcurl-devel tcl-devel tk-devel libxml2-devel
+ texlive texlive-fontsextra texinfo
+ $(vopt_if openblas openblas-devel 'blas-devel lapack-devel')"
 depends="xdg-utils less which"
+checkdepends="tzdata tar"
 short_desc="System for statistical computation and graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
@@ -23,11 +27,27 @@ checksum=09983a8a78d5fb6bc45d27b1c55f9ba5265f78fa54a55c13ae691f87c5bb9e0d
 nocross=yes
 shlib_provides="libR.so"
 
+build_options="openblas"
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|aarch64*|armv[67]*|ppc64*)
+		# Prefer accelerated routines where available
+		build_options_default="openblas"
+		;;
+	*) ;;
+esac
+
 pre_configure() {
 	export R_BROWSER=/usr/bin/xdg-open
 	export R_PDFVIEWER=/usr/bin/xdg-open
 }
 
+do_check() {
+	if [ "${XBPS_CHECK_PKGS}" = full ]; then
+		( TEST_MC_CORES=${XBPS_MAKEJOBS} make check )
+	fi
+}
+
 post_install() {
 	# Sanitize Makeconf flags
 	vsed -i -e 's/^\(CFLAGS\|CXXFLAGS\|CXX1XFLAGS\|FFLAGS\|SAFE_FFLAGS\) = .*/\1 = -O2 -g $(LTO)/' \

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Merged]: R: Use OpenBLAS where available
  2021-01-14  0:59 [PR PATCH] R: Use OpenBLAS where available olafmersmann
  2021-01-14  1:00 ` [PR PATCH] [Updated] " olafmersmann
  2021-01-21 22:21 ` olafmersmann
@ 2021-01-22  4:26 ` ericonr
  2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2021-01-22  4:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 207 bytes --]

There's a merged pull request on the void-packages repository

R: Use OpenBLAS where available
https://github.com/void-linux/void-packages/pull/27908

Description:
Also fixes building of manuals and checks.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-01-22  4:26 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-14  0:59 [PR PATCH] R: Use OpenBLAS where available olafmersmann
2021-01-14  1:00 ` [PR PATCH] [Updated] " olafmersmann
2021-01-21 22:21 ` olafmersmann
2021-01-22  4:26 ` [PR PATCH] [Merged]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).