Re: [PATCH] gnu: Add dlib.

[Marius Bakke <mbakke@fastmail.com>]

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

Leo Famulari <leo@famulari.name> writes:

>> +    (version "19.0")
>
> The released 19.1 yesterday. Will you send an updated patch using the
> latest version?

Wow, fresh out of the oven :)

>
>> +    (arguments
>> +     `(#:phases
>> +       (let ((test-dir (string-append "../dlib-" ,version "/dlib/test/build")))
>> +         (modify-phases %standard-phases
>> +           (add-before 'check 'build-test-suite
>> +             ;; No test target, so we build and run the unit tests here.
>> +             (lambda _
>> +               (mkdir-p test-dir)
>> +               (chdir test-dir)
>> +               (zero? (system* "cmake" ".."))
>> +               (zero? (system* "cmake" "--build" "." "--config" "Release"))))
>> +           (replace 'check
>> +             (lambda _ (zero? (system* "./dtest" "--runall"))))
>
> I think we should combine these two phases, and use
> with-directory-excursion (defined in guix build utils) instead of
> chdir-ing back and forth.
>
>> +           (add-after 'check 'ascend-to-build-directory
>> +             (lambda _ (chdir "../../../../build") #t))))))
>
> Then, this phase can be removed.

That worked great, thanks!

New patch attached.


[-- Attachment #2: 0001-gnu-Add-dlib.patch --]
[-- Type: text/x-patch, Size: 3683 bytes --]

From 5e30eff1cf24b236a78cc5abed870992e84f443f Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sat, 13 Aug 2016 11:26:10 +0100
Subject: [PATCH] gnu: Add dlib.

* gnu/packages/machine-learning.scm (dlib): New variable.
---
 gnu/packages/machine-learning.scm | 52 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index f96672c..bd52e8d 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -32,13 +33,15 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages dejagnu)
   #:use-module (gnu packages gcc)
+  #:use-module (gnu packages image)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages statistics)
   #:use-module (gnu packages swig)
-  #:use-module (gnu packages xml))
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg))
 
 (define-public libsvm
   (package
@@ -467,3 +470,50 @@ geometric models.")
      "This package provides functions for feed-forward neural networks with a
 single hidden layer, and for multinomial log-linear models.")
     (license (list license:gpl2+ license:gpl3+))))
+
+(define-public dlib
+  (package
+    (name "dlib")
+    (version "19.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://dlib.net/files/dlib-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0p2pvcdalc6jhb6r99ybvjd9x74sclr0ngswdg9j2xl5pj7knbr4"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Delete ~13MB of bundled dependencies.
+                  (delete-file-recursively "dlib/external")
+                  (delete-file-recursively "docs/dlib/external")))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:phases
+       (let ((test-dir (string-append "../dlib-" ,version "/dlib/test/build")))
+         (modify-phases %standard-phases
+           (replace 'check
+             ;; No test target, so we build and run the unit tests here.
+             (lambda _
+               (mkdir-p test-dir)
+               (with-directory-excursion test-dir
+                 (zero? (system* "cmake" ".."))
+                 (zero? (system* "cmake" "--build" "." "--config" "Release"))
+                 (zero? (system* "./dtest" "--runall")))))))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("lapack" ,lapack)
+       ("libjpeg" ,libjpeg)
+       ("libpng" ,libpng)
+       ("libx11" ,libx11)
+       ("openblas" ,openblas)
+       ("zlib" ,zlib)))
+    (synopsis "Toolkit for making machine learning and data analysis applications in C++")
+    (description
+     "Dlib is a modern C++ toolkit containing machine learning algorithms and tools.  It
+is used in both industry and academia in a wide range of domains including robotics,
+embedded devices, mobile phones, and large high performance computing environments.")
+    (home-page "http://dlib.net")
+    (license license:boost1.0)))
-- 
2.9.2