ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: dlib: Update to 19.2.

Browse source 
* gnu/packages/machine-learning.scm (dlib): Update to 19.2.
[arguments]: Enable previously failing tests. Fix truthiness of some phases.
[source]: End snippet on #t.
This commit is contained in:
Marius Bakke 2017-02-20 02:08:27 +01:00
parent 025519fa95
commit 0ef7ea66b9
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gnu/packages/machine-learning.scm
View file

@ -504,20 +504,21 @@ (define-public r-kernlab
(define-public dlib (define-public dlib
(package (package
(name "dlib") (name "dlib")
(version "19.1") (version "19.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"http://dlib.net/files/dlib-" version ".tar.bz2")) "http://dlib.net/files/dlib-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0p2pvcdalc6jhb6r99ybvjd9x74sclr0ngswdg9j2xl5pj7knbr4")) "0jh840b3ynlqsvbpswzg994yk539zbhx2sk6lybd23qyd2b8zgi8"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
;; Delete ~13MB of bundled dependencies. ;; Delete ~13MB of bundled dependencies.
(delete-file-recursively "dlib/external") (delete-file-recursively "dlib/external")
(delete-file-recursively "docs/dlib/external"))))) (delete-file-recursively "docs/dlib/external")
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -532,8 +533,7 @@ (define-public dlib
(add-after 'disable-asserts 'disable-failing-tests (add-after 'disable-asserts 'disable-failing-tests
(lambda _ (lambda _
;; One test times out on MIPS, so we need to disable it. ;; One test times out on MIPS, so we need to disable it.
;; The rest is known to fail on non-x86_64 platforms in the current release. ;; Others are flaky on some platforms.
;; Some have been fixed in git; this list should be readjusted next update.
(let* ((system ,(or (%current-target-system) (let* ((system ,(or (%current-target-system)
(%current-system))) (%current-system)))
(disabled-tests (cond (disabled-tests (cond
@ -543,15 +543,14 @@ (define-public dlib
((string-prefix? "armhf" system) ((string-prefix? "armhf" system)
'("learning_to_track" "max_cost_assignment")) '("learning_to_track" "max_cost_assignment"))
((string-prefix? "i686" system) ((string-prefix? "i686" system)
'("optimization" "matrix2" "mpc")) '("optimization"))
(else '())))) (else '()))))
;; The following test fails due a bug in openblas < 0.2.18.
(append! disabled-tests '("empirical_map"))
(for-each (for-each
(lambda (test) (lambda (test)
(substitute* "dlib/test/makefile" (substitute* "dlib/test/makefile"
(((string-append "SRC \\+= " test "\\.cpp")) "")) #t) (((string-append "SRC \\+= " test "\\.cpp")) "")))
disabled-tests)))) disabled-tests)
#t)))
(replace 'check (replace 'check
(lambda _ (lambda _
;; No test target, so we build and run the unit tests here. ;; No test target, so we build and run the unit tests here.
@ -562,7 +561,9 @@ (define-public dlib
(zero? (system* "./dtest" "--runall"))))))) (zero? (system* "./dtest" "--runall")))))))
(add-after 'install 'delete-static-library (add-after 'install 'delete-static-library
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(delete-file (string-append (assoc-ref outputs "out") "/lib/libdlib.a"))))))) (delete-file (string-append (assoc-ref outputs "out")
"/lib/libdlib.a"))
#t)))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(inputs (inputs