unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#29811] gnu: maths: Build with LAPACK.
@ 2017-12-22 13:23 Dave Love
  2017-12-23 21:12 ` bug#29811: " Danny Milosavljevic
  0 siblings, 1 reply; 2+ messages in thread
From: Dave Love @ 2017-12-22 13:23 UTC (permalink / raw)
  To: 29811

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

This restores the optimizations for LAPACK which OpenBLAS provides.


[-- Attachment #2: 0001-gnu-maths-Build-with-LAPACK.patch --]
[-- Type: text/x-diff, Size: 2220 bytes --]

From c570eaa41688e76e466179dd55bfdc567f1d8110 Mon Sep 17 00:00:00 2001
From: Dave Love <fx@gnu.org>
Date: Fri, 22 Dec 2017 13:16:12 +0000
Subject: [PATCH] gnu: maths: Build with LAPACK.

* gnu/packages/maths.scm (openblas)[arguments]: Don't disable LAPACK;
add set-extralib phase.
[inputs]: Add fortran-lib.
---
 gnu/packages/maths.scm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 8a48ec2fc..6c07125b2 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -21,6 +21,7 @@
 ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
 ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017 Dave Love <me@fx@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2649,7 +2650,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=<type>, where "type" is a supported CPU type.
@@ -2670,11 +2670,20 @@ 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")))))))
     (native-inputs
      `(("cunit" ,cunit)
        ("perl" ,perl)
        ("fortran" ,gfortran)))
+    (inputs `(("fortran-lib" ,gfortran "lib")))
     (home-page "http://www.openblas.net/")
     (synopsis "Optimized BLAS library based on GotoBLAS")
     (description
-- 
2.11.0


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

* bug#29811: gnu: maths: Build with LAPACK.
  2017-12-22 13:23 [bug#29811] gnu: maths: Build with LAPACK Dave Love
@ 2017-12-23 21:12 ` Danny Milosavljevic
  0 siblings, 0 replies; 2+ messages in thread
From: Danny Milosavljevic @ 2017-12-23 21:12 UTC (permalink / raw)
  To: Dave Love; +Cc: 29811-done

I added #t to the end of the phase, tested and committed to master as 493937ae1fb5b3ffdd836c144cb4682067b94de9.

Thanks!

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

end of thread, other threads:[~2017-12-23 21:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-22 13:23 [bug#29811] gnu: maths: Build with LAPACK Dave Love
2017-12-23 21:12 ` bug#29811: " Danny Milosavljevic

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).