mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 13:58:15 -05:00
gnu: ipopt: Use libblas from LAPACK, and fix 'Libs' in 'ipopt.pc'.
* gnu/packages/maths.scm (ipopt)[inputs]: Remove OPENBLAS. [arguments]: New field.
This commit is contained in:
parent
f9940ef1e8
commit
ad1c453731
1 changed files with 18 additions and 2 deletions
|
@ -599,12 +599,28 @@ (define-public ipopt
|
||||||
;; Make sure we don't use the bundled software.
|
;; Make sure we don't use the bundled software.
|
||||||
'(delete-file-recursively "ThirdParty"))))
|
'(delete-file-recursively "ThirdParty"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
'(#:phases (modify-phases %standard-phases
|
||||||
|
(add-after 'install 'add--L-flags-in-ipopt.pc
|
||||||
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||||
|
;; The '.pc' file lists '-llapack -lblas' in "Libs";
|
||||||
|
;; move it to "Libs.private" where it belongs, and add a
|
||||||
|
;; '-L' flag for LAPACK.
|
||||||
|
(let ((out (assoc-ref outputs "out"))
|
||||||
|
(lapack (assoc-ref inputs "lapack")))
|
||||||
|
(substitute* (string-append out "/lib/pkgconfig/"
|
||||||
|
"ipopt.pc")
|
||||||
|
(("Libs: (.*)-llapack -lblas(.*)$" _ before after)
|
||||||
|
(string-append "Libs: " before " " after "\n"
|
||||||
|
"Libs.private: " before
|
||||||
|
"-L" lapack "/lib -llapack -lblas "
|
||||||
|
after "\n")))
|
||||||
|
#t))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("gfortran" ,gfortran)))
|
`(("gfortran" ,gfortran)))
|
||||||
(inputs
|
(inputs
|
||||||
;; TODO: Maybe add dependency on COIN-MUMPS, ASL, and HSL.
|
;; TODO: Maybe add dependency on COIN-MUMPS, ASL, and HSL.
|
||||||
`(("blas" ,openblas)
|
`(("lapack" ,lapack))) ;for both libblas and liblapack
|
||||||
("lapack" ,lapack)))
|
|
||||||
(home-page "http://www.coin-or.org")
|
(home-page "http://www.coin-or.org")
|
||||||
(synopsis "Large-scale nonlinear optimizer")
|
(synopsis "Large-scale nonlinear optimizer")
|
||||||
(description
|
(description
|
||||||
|
|
Loading…
Reference in a new issue