From 493937ae1fb5b3ffdd836c144cb4682067b94de9 Mon Sep 17 00:00:00 2001 From: Dave Love Date: Sat, 23 Dec 2017 20:36:12 +0100 Subject: gnu: openblas: Build with LAPACK. * gnu/packages/maths.scm (openblas)[arguments]: Don't disable LAPACK; add set-extralib phase. [inputs]: Add fortran-lib. Signed-off-by: Danny Milosavljevic --- gnu/packages/maths.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 837e142f59..b1a497c36b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright � 2017 Dave Love ;;; ;;; This file is part of GNU Guix. ;;; @@ -2641,7 +2642,6 @@ parts of it.") #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) "SHELL=bash" - "NO_LAPACK=1" ;; Build the library for all supported CPUs. This allows ;; switching CPU targets at runtime with the environment variable ;; OPENBLAS_CORETYPE=, where "type" is a supported CPU type. @@ -2662,11 +2662,21 @@ parts of it.") '("TARGET=ARMV8")) (else '())))) ;; no configure script - #:phases (alist-delete 'configure %standard-phases))) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'set-extralib + (lambda* (#:key inputs #:allow-other-keys) + ;; Get libgfortran found when building in utest. + (setenv "FEXTRALIB" + (string-append "-L" (assoc-ref inputs "fortran-lib") + "/lib")) + #t))))) (inputs - `(("fortran" ,gfortran))) + `(("fortran-lib" ,gfortran "lib"))) (native-inputs `(("cunit" ,cunit) + ("fortran" ,gfortran) ("perl" ,perl))) (home-page "http://www.openblas.net/") (synopsis "Optimized BLAS library based on GotoBLAS") -- cgit v1.2.3 From e9960d8cbae74a7660988e0d5724ffc96a016137 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Dec 2017 01:01:21 +0100 Subject: gnu, doc: Use HTTPS for cran.r-project.org home pages. * gnu/packages/bioinformatics.scm (r-sparql, r-acsnminer, r-gkmsvm) (r-maldiquant, r-gprofiler)[home-page]: Use HTTPS. * gnu/packages/cran.scm (r-colorspace, r-auc, r-calibrate, r-shape) (r-compare, r-proxy, r-sp, r-rmtstat, r-lmtest, r-inline, r-bbmle) (r-lpsolve, r-energy, r-suppdists, r-ksamples, r-cvst, r-drr, r-prodlim) (r-ddalpha, r-rcpproll, r-ipred, r-psych, r-truncnorm, r-rsolnp, r-laeken) (r-vcd, r-ica, r-scatterplot3d)[home-page]: Likewise. * gnu/packages/machine-learning.scm (r-adaptivesparsity, r-kernlab) [home-page]: Likewise. * gnu/packages/maths.scm (r-quadprog, r-pracma)[home-page]: Likewise. * gnu/packages/statistics.scm (r-boot, r-cluster, r-codetools, r-foreign) (r-kernsmooth, r-nlme, r-mgcv, r-rpart, r-dichromat, r-estimability) (r-pheatmap, r-labeling, r-magrittr, r-munsell, r-rcolorbrewer, r-sendmailr) (r-gdtools, r-acepack, r-formula, r-locfit, r-chron, r-coda, r-backports) (r-brew, r-commonmark, r-rstudioapi, r-plotrix, r-gridbase, r-bitops) (r-catools, r-xnomial, r-lambda-r, r-whoreadsthis, r-futile-options) (r-futile-logger, r-segmented, r-snow, r-iterators, r-foreach, r-doparallel) (r-domc, r-irlba, r-registry, r-e1071, r-bigmemory-sri, r-r-methodss3) (r-tidyselect, r-base64, r-runit, r-sfsmisc, r-gtools, r-gdata, r-gplots) (r-ztable, r-vipor, r-sourcetools, r-statmod, r-compquadform, r-mixtools) (r-fastica, r-diptest, r-modeltools, r-flexmix, r-deoptimr, r-pcapp) (r-rrcov, r-fit-models, r-robust, r-trimcluster, r-fpc, r-fnn) (r-modelmetrics, r-nloptr, r-lme4, r-tclust, r-lubridate)[home-page]: Likewise. * gnu/packages/web.scm (r-htmltools, r-hwriter, r-rjson, r-rook)[home-page]: Likewise. * doc/guix.texi (Invoking guix import, Invoking guix refresh): Likewise. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b1a497c36b..e8c7707408 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1885,7 +1885,7 @@ sparse system of linear equations A x = b using Guassian elimination.") (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) - (home-page "http://cran.r-project.org/web/packages/quadprog") + (home-page "https://cran.r-project.org/web/packages/quadprog") (synopsis "Functions to solve quadratic programming problems") (description "This package contains routines and documentation for solving quadratic @@ -1904,7 +1904,7 @@ programming problems.") (build-system r-build-system) (propagated-inputs `(("r-quadprog" ,r-quadprog))) - (home-page "http://cran.r-project.org/web/packages/pracma") + (home-page "https://cran.r-project.org/web/packages/pracma") (synopsis "Practical numerical math functions") (description "This package provides functions for numerical analysis and linear algebra, numerical optimization, differential equations, plus some -- cgit v1.2.3 From dc7d6d4ece30c7ab25e9f1927d64f2b409ab896c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Dec 2017 20:51:48 +0100 Subject: gnu: Fix copyright symbol. * gnu/packages/maths.scm: Fix copyright line for Dave Love. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e8c7707408..bce6627379 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017 Tobias Geerinckx-Rice -;;; Copyright � 2017 Dave Love +;;; Copyright © 2017 Dave Love ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3