From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: [PATCH] gnu: Add dlib. Date: Mon, 15 Aug 2016 12:51:15 +0100 Message-ID: <87oa4ugsi4.fsf@ike.i-did-not-set--mail-host-address--so-tickle-me> References: <8737m837zk.fsf@ike.i-did-not-set--mail-host-address--so-tickle-me> <20160814172544.GA28736@jasmine> <87twengmbh.fsf@ike.i-did-not-set--mail-host-address--so-tickle-me> <87a8gexyrz.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:58227) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZGQZ-00027H-PS for guix-devel@gnu.org; Mon, 15 Aug 2016 07:51:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bZGQV-0001wp-7h for guix-devel@gnu.org; Mon, 15 Aug 2016 07:51:35 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:46698) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZGQS-0001vi-RH for guix-devel@gnu.org; Mon, 15 Aug 2016 07:51:31 -0400 In-Reply-To: <87a8gexyrz.fsf@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Alex Kost Cc: guix-devel --=-=-= Content-Type: text/plain >> + (build-system cmake-build-system) >> + (arguments >> + `(#:phases >> + (let ((test-dir (string-append "../dlib-" ,version "/dlib/test/build"))) > > I think it's better to move this 'let' inside the phase: ... > >> + (modify-phases %standard-phases >> + (replace 'check >> + ;; No test target, so we build and run the unit tests here. >> + (lambda _ > > ... here. You're right. I tried that in an early iteration and it failed; I assumed "version" was not available in that scope. Must have noobed something else since it works fine now.. :) >> + (mkdir-p test-dir) >> + (with-directory-excursion test-dir >> + (zero? (system* "cmake" "..")) >> + (zero? (system* "cmake" "--build" "." "--config" "Release")) >> + (zero? (system* "./dtest" "--runall"))))))))) > > There is no point in the first 2 'zero?' calls as their returning > values will be lost, rather: > > (and (zero? (system* "cmake" "..")) > (zero? (system* "cmake" "--build" "." "--config" "Release")) > (zero? (system* "./dtest" "--runall"))) Thanks for pointing that out; fixed. >> + (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.") > > As for me, the above lines (in synopsis and description) are too long, I > would stay inside 72-78 columns. Disagreeing with the linter, are we? ;) I've trimmed the lengths a bit. Thanks! --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-dlib.patch Content-Transfer-Encoding: quoted-printable >From 8ffcd39f9c8e3cea7ae925341cc19dc3b45941a3 Mon Sep 17 00:00:00 2001 From: Marius Bakke 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 | 54 +++++++++++++++++++++++++++++++++++= +++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learn= ing.scm index f96672c..674af10 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 =C2=A9 2015, 2016 Ricardo Wurmus ;;; Copyright =C2=A9 2016 Efraim Flashner +;;; Copyright =C2=A9 2016 Marius Bakke ;;; ;;; 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)) =20 (define-public libsvm (package @@ -467,3 +470,52 @@ geometric models.") "This package provides functions for feed-forward neural networks wit= h 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 + (modify-phases %standard-phases + (replace 'check + (lambda _ + ;; No test target, so we build and run the unit tests here. + (let ((test-dir (string-append "../dlib-" ,version "/dlib/tes= t/build"))) + (mkdir-p test-dir) + (with-directory-excursion test-dir + (and (zero? (system* "cmake" "..")) + (zero? (system* "cmake" "--build" "." "--config" "Re= lease")) + (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 i= n 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 perfor= mance +computing environments.") + (home-page "http://dlib.net") + (license license:boost1.0))) --=20 2.9.2 --=-=-=--