Re: [PATCH] gnu: Add Scikit-learn.

[Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>]

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


Andreas Enge writes:

> On Mon, Feb 23, 2015 at 06:17:47PM +0100, Ricardo Wurmus wrote:
>> The python2-scikit-learn package isn't working as it should.  It does
>> not actually install python2.7 libraries but just the 3.3 libs.
>
> I think you did things the wrong way around: You inherit from the python3
> package, then swap its inputs against those from the python2-wrapped one.
> In this way, the "#:python" field of "arguments" remains at python3.

Yeah, I screwed up.  Attached is a better version that actually works.
I explicitly delete python-scipy and python-numpy, both of which have
matplotlib (and thus the problematic python-pycairo) as inputs, from the
propagated inputs and add their python2 versions manually.

~~ Ricardo


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-Scikit-learn.patch --]
[-- Type: text/x-patch, Size: 3381 bytes --]

From bc1f142127c734342cd308476ce9a7540f8326ec Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Mon, 23 Feb 2015 17:22:29 +0100
Subject: [PATCH] gnu: Add Scikit-learn.

* gnu/packages/python.scm (python-scikit-learn, python2-scikit-learn): New
  variables.
---
 gnu/packages/python.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6515237..7128182 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1952,6 +1952,74 @@ sources.")
 (define-public python2-sphinx-rtd-theme
   (package-with-python2 python-sphinx-rtd-theme))
 
+(define-public python-scikit-learn
+  (package
+    (name "python-scikit-learn")
+    (version "0.15.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/scikit-learn/scikit-learn/archive/"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "1rb93h2q15f219sz60sczjb65rg70xjmnp0q4pkkaairx5s05q55"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (alist-cons-before
+        'build 'set-environment-variables
+        (lambda* (#:key inputs #:allow-other-keys)
+          (let* ((atlas-threaded
+                  (string-append (assoc-ref inputs "atlas")
+                                 "/lib/libtatlas.so"))
+                 ;; On single core CPUs only the serial library is created.
+                 (atlas-lib
+                  (if (file-exists? atlas-threaded)
+                      atlas-threaded
+                      (string-append (assoc-ref inputs "atlas")
+                                     "/lib/libsatlas.so"))))
+            (setenv "ATLAS" atlas-lib)))
+        (alist-cons-before
+         'check 'set-HOME
+         ;; some tests require access to "$HOME"
+         (lambda _ (setenv "HOME" "/tmp"))
+         ;; Tests can only be run after the library has been installed and not
+         ;; within the source directory.
+         (alist-cons-after
+          'install 'check
+          (lambda _
+            (with-directory-excursion "/tmp"
+              ;; With Python 3 one test of 3334 fails
+              ;; (sklearn.tests.test_common.test_transformers); see
+              ;; https://github.com/scikit-learn/scikit-learn/issues/3693
+              (system* "nosetests" "-v" "sklearn")))
+          (alist-delete 'check %standard-phases))))))
+    (inputs
+     `(("atlas" ,atlas)
+       ("python-nose" ,python-nose)))
+    (propagated-inputs
+     `(("python-numpy" ,python-numpy)
+       ("python-scipy" ,python-scipy)))
+    (home-page "http://scikit-learn.org/")
+    (synopsis "Machine Learning in Python")
+    (description
+     "Scikit-learn provides simple and efficient tools for data
+mining and data analysis.")
+    (license bsd-3)))
+
+(define-public python2-scikit-learn
+  (let ((scikit (package-with-python2 python-scikit-learn)))
+    (package (inherit scikit)
+      (propagated-inputs
+       `(("python2-numpy" ,python2-numpy)
+         ("python2-scipy" ,python2-scipy)
+         ,@(alist-delete
+            "python-numpy"
+            (alist-delete
+             "python-scipy" (package-propagated-inputs scikit))))))))
+
 (define-public python-cython
   (package
     (name "python-cython")
-- 
2.1.0