From 639ae3f20bea5ccd7f4a4df7a828569639220e79 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 27 Apr 2020 13:54:43 +0200 Subject: gnu: Add python-scikit-rebate. * gnu/packages/machine-learning.scm (python-scikit-rebate): New variable. --- gnu/packages/machine-learning.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/machine-learning.scm') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 9a88b53415..223d03e979 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -867,6 +867,35 @@ data analysis.") (base32 "08zbzi8yx5wdlxfx9jap61vg1malc9ajf576w7a0liv6jvvrxlpj"))))))) +(define-public python-scikit-rebate + (package + (name "python-scikit-rebate") + (version "0.6") + (source (origin + (method url-fetch) + (uri (pypi-uri "skrebate" version)) + (sha256 + (base32 + "1h7qs9gjxpzqabzhb8rmpv3jpmi5iq41kqdibg48299h94iikiw7")))) + (build-system python-build-system) + ;; Pandas is only needed to run the tests. + (native-inputs + `(("python-pandas" ,python-pandas))) + (propagated-inputs + `(("python-numpy" ,python-numpy) + ("python-scipy" ,python-scipy) + ("python-scikit-learn" ,python-scikit-learn) + ("python-joblib" ,python-joblib))) + (home-page "https://epistasislab.github.io/scikit-rebate/") + (synopsis "Relief-based feature selection algorithms for Python") + (description "Scikit-rebate is a scikit-learn-compatible Python +implementation of ReBATE, a suite of Relief-based feature selection algorithms +for Machine Learning. These algorithms excel at identifying features that are +predictive of the outcome in supervised learning problems, and are especially +good at identifying feature interactions that are normally overlooked by +standard feature selection algorithms.") + (license license:expat))) + (define-public python-autograd (let* ((commit "442205dfefe407beffb33550846434baa90c4de7") (revision "0") -- cgit v1.2.3 From 0877b74f6e5ee30ce36caea57e3f165e1cd4a731 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 28 Apr 2020 00:24:38 +0200 Subject: gnu: kaldi: Update to 0-2.d4791c0. * gnu/packages/machine-learning.scm (kaldi): Update to 0-2.d4791c0. --- gnu/packages/machine-learning.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/machine-learning.scm') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 223d03e979..1072930bfa 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2016, 2020 Efraim Flashner ;;; Copyright © 2016, 2017, 2020 Marius Bakke ;;; Copyright © 2016 Hartmut Goebel @@ -1056,8 +1056,8 @@ association studies (GWAS) on extremely large data sets.") ;; There have been no proper releases yet. (define-public kaldi - (let ((commit "2f95609f0bb085bd3a1dc5eb0a39f3edea59e606") - (revision "1")) + (let ((commit "d4791c0f3fc1a09c042dac365e120899ee2ad21e") + (revision "2")) (package (name "kaldi") (version (git-version "0" revision commit)) @@ -1069,7 +1069,7 @@ association studies (GWAS) on extremely large data sets.") (file-name (git-file-name name version)) (sha256 (base32 - "082qh3pfi7hvncylp4xsmkfahbd7gb0whdfa4rwrx7fxk9rdh3kz")))) + "07k80my6f19mhrkwbzhjsnpf9871wmrwkl0ym468i830w67qyjrz")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From b3cf5f8601dd3e35295f0bc2f5193a12fb51ede6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 28 Apr 2020 08:42:39 +0200 Subject: gnu: gst-kaldi-nnet2-online: Update to 0-2.cb227ef. * gnu/packages/machine-learning.scm (gst-kaldi-nnet2-online): Update to 0-2.cb227ef. --- gnu/packages/machine-learning.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/machine-learning.scm') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 1072930bfa..0f960ada95 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1167,8 +1167,8 @@ written in C++.") (license license:asl2.0)))) (define-public gst-kaldi-nnet2-online - (let ((commit "617e43e73c7cc45eb9119028c02bd4178f738c4a") - (revision "1")) + (let ((commit "cb227ef43b66a9835c14eb0ad39e08ee03c210ad") + (revision "2")) (package (name "gst-kaldi-nnet2-online") (version (git-version "0" revision commit)) @@ -1180,7 +1180,7 @@ written in C++.") (file-name (git-file-name name version)) (sha256 (base32 - "0xh3w67b69818s6ib02ara4lw7wamjdmh4jznvkpzrs4skbs9jx9")))) + "1i6ffwiavxx07ri0lxix6s8q0r31x7i4xxvhys5jxkixf5q34w8g")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are none -- cgit v1.2.3 From d9e9a2617664ae830c77e8a64aa733400a57c566 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Fri, 24 Apr 2020 14:36:20 +0200 Subject: gnu: python-scikit-learn: Make python-joblib a propagated input. * gnu/packages/machine-learning.scm (python-scikit-learn) [native-inputs]: Move 'python-joblib' to ... [propagated-inputs]: ... here. Signed-off-by: Mathieu Othacehe --- gnu/packages/machine-learning.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/machine-learning.scm') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 0f960ada95..f979a64d55 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Guillaume Le Vaillant ;;; Copyright © 2019 Brett Gilio +;;; Copyright © 2020 Konrad Hinsen ;;; ;;; This file is part of GNU Guix. ;;; @@ -835,13 +836,13 @@ computing environments.") (inputs `(("openblas" ,openblas))) (native-inputs - `(("python-joblib" ,python-joblib) - ("python-pytest" ,python-pytest) + `(("python-pytest" ,python-pytest) ("python-pandas" ,python-pandas) ;for tests ("python-cython" ,python-cython))) (propagated-inputs `(("python-numpy" ,python-numpy) - ("python-scipy" ,python-scipy))) + ("python-scipy" ,python-scipy) + ("python-joblib" ,python-joblib))) (home-page "https://scikit-learn.org/") (synopsis "Machine Learning in Python") (description -- cgit v1.2.3 From 1228c2abcfd5b426385211e3b27379f27d655b17 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 28 Apr 2020 13:34:22 +0200 Subject: gnu: kaldi-gstreamer-server: Update to 0-2.f68cab4. * gnu/packages/machine-learning.scm (kaldi-gstreamer-server): Update to 0-2.f68cab4. [inputs]: Replace python-2 with python-wrapper, python2-pygobject with python-pygobject, python2-pyyaml with python-pyyaml, and python2-tornado with python-tornado; remove python2-ws4py-for-kaldi-gstreamer-server and python2-futures. --- gnu/packages/machine-learning.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'gnu/packages/machine-learning.scm') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index f979a64d55..425961ee14 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1239,8 +1239,9 @@ automatically.") (license license:asl2.0)))) (define-public kaldi-gstreamer-server - (let ((commit "1735ba49c5dc0ebfc184e45105fc600cd9f1f508") - (revision "1")) + ;; This is the tip of the py3 branch + (let ((commit "f68cab490be7eb0da2af1475fbc16655f50a60cb") + (revision "2")) (package (name "kaldi-gstreamer-server") (version (git-version "0" revision commit)) @@ -1252,7 +1253,7 @@ automatically.") (file-name (git-file-name name version)) (sha256 (base32 - "0j701m7lbwmzqxsfanj882v7881hrbmpqybbczbxqpcbg8q34w0k")))) + "17lh1368vkg8ngrcbn2phvigzlmalrqg6djx2gg61qq1a0nj87dm")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are no tests that can be run automatically @@ -1268,6 +1269,10 @@ automatically.") ;; are reproducible. (setenv "PYTHONHASHSEED" "0") (with-directory-excursion "kaldigstserver" + ;; This is a Python 2 file + (delete-file "decoder_test.py") + (delete-file "test-buffer.py") + (for-each (lambda (file) (apply invoke `("python" @@ -1318,12 +1323,10 @@ exec ~a ~a/~a \"$@\"~%" #t)))))) (inputs `(("gst-kaldi-nnet2-online" ,gst-kaldi-nnet2-online) - ("python2" ,python-2) - ("python2-futures" ,python2-futures) - ("python2-pygobject" ,python2-pygobject) - ("python2-pyyaml" ,python2-pyyaml) - ("python2-tornado" ,python2-tornado) - ("python2-ws4py" ,python2-ws4py-for-kaldi-gstreamer-server))) + ("python" ,python-wrapper) + ("python-pygobject" ,python-pygobject) + ("python-pyyaml" ,python-pyyaml) + ("python-tornado" ,python-tornado))) (home-page "https://github.com/alumae/kaldi-gstreamer-server") (synopsis "Real-time full-duplex speech recognition server") (description "This is a real-time full-duplex speech recognition server, -- cgit v1.2.3 From cb44af24c8308dd7e17e991ed6ee803f3cb8a1c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 13:03:59 +0200 Subject: gnu: kaldi-gstreamer-server: Use Tornado 6. * gnu/packages/machine-learning.scm (kaldi-gstreamer-server)[inputs]: Replace python-tornado with python-tornado-6. --- gnu/packages/machine-learning.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/machine-learning.scm') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 425961ee14..df2943167d 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1326,7 +1326,7 @@ exec ~a ~a/~a \"$@\"~%" ("python" ,python-wrapper) ("python-pygobject" ,python-pygobject) ("python-pyyaml" ,python-pyyaml) - ("python-tornado" ,python-tornado))) + ("python-tornado" ,python-tornado-6))) (home-page "https://github.com/alumae/kaldi-gstreamer-server") (synopsis "Real-time full-duplex speech recognition server") (description "This is a real-time full-duplex speech recognition server, -- cgit v1.2.3 From 46d07f8472f09813be287fa5a10afb50c959dcb1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Apr 2020 13:04:55 +0200 Subject: gnu: kaldi-gstreamer-server: Fix bug. * gnu/packages/machine-learning.scm (kaldi-gstreamer-server)[arguments]: Patch master_server.py before build. --- gnu/packages/machine-learning.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/machine-learning.scm') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index df2943167d..8c817d3e3b 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1269,6 +1269,10 @@ automatically.") ;; are reproducible. (setenv "PYTHONHASHSEED" "0") (with-directory-excursion "kaldigstserver" + ;; See https://github.com/alumae/kaldi-gstreamer-server/issues/232 + (substitute* "master_server.py" + (("\\.replace\\('\\\\.*") ")")) + ;; This is a Python 2 file (delete-file "decoder_test.py") (delete-file "test-buffer.py") -- cgit v1.2.3