gnu: python-scipy: Build with OpenBLAS and lapack.

* gnu/packages/python.scm (python-scipy)[inputs]: Remove "atlas", add "lapack"
  and "openblas".
* gnu/packages/python.scm (python-scipy)[arguments]: Replace phase
  "set-environment-variables" with "configure-openblas".
This commit is contained in:
Ricardo Wurmus 2015-06-12 11:30:51 +02:00
parent cba256f8fa
commit 719b01c157
1 changed files with 18 additions and 12 deletions

View File

@ -2630,7 +2630,8 @@ toolkits.")
("python-pyparsing" ,python-pyparsing) ("python-pyparsing" ,python-pyparsing)
("python-nose" ,python-nose) ("python-nose" ,python-nose)
("python-sphinx" ,python-sphinx) ("python-sphinx" ,python-sphinx)
("atlas" ,atlas))) ("lapack" ,lapack)
("openblas" ,openblas)))
(native-inputs (native-inputs
`(("gfortran" ,gfortran-4.8) `(("gfortran" ,gfortran-4.8)
("texlive" ,texlive) ("texlive" ,texlive)
@ -2639,18 +2640,23 @@ toolkits.")
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-before (alist-cons-before
'build 'set-environment-variables 'build 'configure-openblas
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let* ((atlas-threaded (call-with-output-file "site.cfg"
(string-append (assoc-ref inputs "atlas") (lambda (port)
"/lib/libtatlas.so")) (format port
;; On single core CPUs only the serial library is created. "[blas]
(atlas-lib libraries = openblas
(if (file-exists? atlas-threaded) library_dirs = ~a/lib
atlas-threaded include_dirs = ~a/include
(string-append (assoc-ref inputs "atlas") [atlas]
"/lib/libsatlas.so")))) library_dirs = ~a/lib
(setenv "ATLAS" atlas-lib))) atlas_libs = openblas
"
(assoc-ref inputs "openblas")
(assoc-ref inputs "openblas")
(assoc-ref inputs "openblas"))))
#t)
(alist-cons-after (alist-cons-after
'install 'install-doc 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)