summaryrefslogtreecommitdiff
path: root/sci-libs/scikits_learn
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs/scikits_learn')
-rw-r--r--sci-libs/scikits_learn/Manifest19
-rw-r--r--sci-libs/scikits_learn/files/scikits_learn-0.14.1-system-cblas.patch28
-rw-r--r--sci-libs/scikits_learn/files/scikits_learn-0.17.1-system-cblas.patch30
-rw-r--r--sci-libs/scikits_learn/files/scikits_learn-0.20.2-fix-cdfast.patch42
-rw-r--r--sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild117
-rw-r--r--sci-libs/scikits_learn/scikits_learn-0.17.ebuild117
-rw-r--r--sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild120
-rw-r--r--sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild120
-rw-r--r--sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild4
-rw-r--r--sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild (renamed from sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild)14
-rw-r--r--sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild (renamed from sci-libs/scikits_learn/scikits_learn-0.18.2-r1.ebuild)43
11 files changed, 70 insertions, 584 deletions
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index a47e6c7658b0..306a618ba3b4 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -1,16 +1,9 @@
-AUX scikits_learn-0.14.1-system-cblas.patch 1072 BLAKE2B ef9b50a89065bd546ee7d5277df4b9b071cb1e30d18a6517738536eac0964ea9c28ba3d1e333522a2a919316427c688cf4cbbe342460f7f4542c152180ad9998 SHA512 bb9d7265c81fe11d5a4467716e982eafb046cd24fe317a01e02d20ff43df39e9557a4325f26cf131b87a26e9fe86342abf3166be058aeeca41fb675f9ead17d3
-AUX scikits_learn-0.17.1-system-cblas.patch 1344 BLAKE2B b7629bc48cdbd628d764de6aa22bcc2a6e4836f859a3eb76e6447a898ee52598c6810e33fa13d86edd03715ac19fcd3e80009583709ee9b4017caef252110956 SHA512 8f4c83771a8b196ce3daff3d0a57f8d9a5d53d49528ac206aee767867d273056f50105371d6aa2e46e47fdd2c29ab56c3c1a41aef747c36af95c9968ccb8d755
AUX scikits_learn-0.18.1-system-cblas.patch 1366 BLAKE2B 8678695de19e8c56b1a0f98193da79c69d32a81f1c419d0c594afe7865d5469312d7f9799ae0ccca307d2acbdc9f1a8641b446a7cb6b263a81c4b50ff260c1d4 SHA512 be8527fa924502453a9f43af5b3553db50f97b4b1f1ee14fcb2699319e77e3d0d3c19bf82bd66357c6464011dcb819e3625a83360923d322f5d340568a72cbf6
-DIST scikit-learn-0.17.1.tar.gz 7898571 BLAKE2B 4125864e8701e072e45f83be504a0eba8480f2c08584a6e98f2ae09dd4d64487931eca2ae116230b0d8945822d6e07cc2102129f48e789825c2b70102121fa06 SHA512 5786e04a13225d2433103f1873f2753e332704b98c4c32b840970f763ec1abf0248007089e5ae47e11c66535f05a0d0402715622e6d6f0955ec7961b92e1b2e5
-DIST scikit-learn-0.17.tar.gz 7834903 BLAKE2B 9492a0deff723bd1ff3a976f080a5db0d1bf590521a324d627b09bbb755dbdccc6e41fe71519e10bbad8d425b6b12ff6f44b0518d501d9d075dfa5d021be64dd SHA512 53a76e2f90e27967bf216cd9d7e8051ed847a3381e3b7b7b8236511b4105eef41bd4d3c9f7f71a51db4b0bf99cbd571d7c1b26803757cff04424b70cb834b555
-DIST scikit-learn-0.18.1.tar.gz 8933930 BLAKE2B 48cfc73769531242d1228f41115a78e4649c52e7d8796e54286f996ddab72353e3f73bf22302535b7d24f55194e893ed681c74dd60beab5f8ba09aa3af8e161a SHA512 7149e683424351a28c19501302ece147cb03d4d12b08822eb2b1898a4978b96803323778fbba628008dd7a7c85daea4e9b550a71ee76851f9a09b2baac18a799
-DIST scikit-learn-0.18.2.tar.gz 9224516 BLAKE2B fe4b402e3ac561f9272a0a51ddc17092f2a9fada3e2dc081be3fe66bb7932e0ca0c14d9be21272c364d13c4d9669e9ff399e16b53b5cbaa3f5b20e43d2bb448d SHA512 7c5c7bdd577ad215790654ce1eff6e802aebe53283ab6c5f12684cf99aeecc8976f9a9803f619f549d4d03be0d7634f249046e4b4f15afa12aecb2697e2e0b05
+AUX scikits_learn-0.20.2-fix-cdfast.patch 3401 BLAKE2B cb75c941c2d7a81cde7fe07dc46107730bed0323ce07030f3401138234816c9edc53aff18973545f66a5ed6c54ab11b7dd2a04faf7d106dd046d54c84533c697 SHA512 56ef8a8e66138df5b2899e38d04c9d1303882103fa3c16c31c592a42a22c2111ab490caa0cd6d83332b21184f9c88b13e735cf5317f4f58d7e1c0356a74e0114
DIST scikit-learn-0.19.0.tar.gz 9341628 BLAKE2B c9e0c12558e81efb6f5cfddead028980b0019d2f6d0fdce5662c9138ec3a5b2a3d30b022a5713578bc7effd09894006e8f7f60a3e038ca66297502d9d4212686 SHA512 1b88bc043b08de9b5bb1f3814b8101c73ced010cf94bd725fb69e1ef95b4a9597a34de4a19f84fbbf63e54d47e95b3ff498d611234fcdfcaa5e4e3cf696289d2
-EBUILD scikits_learn-0.17.1.ebuild 3129 BLAKE2B 3ed1bbf4d4a71659f0b8e7bf2366e6a8b8995def99821d2e58d2af68558183e944fee67b9c194e963b6a7fcb2011b2983e2b5223082cc7a2182e3ea9d6d19df0 SHA512 f078a56afcfc2e163628b9bf8101909b770955f0344cd0bc8cc1db19bcddde785fd3fab99b7504e8f4a3b11db42393430f24c94efe352b2be737cc6ec5d11697
-EBUILD scikits_learn-0.17.ebuild 3128 BLAKE2B 213d49e59a2dc8b846bb91849f7508008ca238ebd614bfeb37851137802650ee577636c1599b572d89b263ef90b645eb7090cf75e84ecb1423a56122cb438f5c SHA512 e9711822a4c74ee1ec13aa1c8a9a884208962a31f6ea20d2688d1cab62effa5373bd29d3aba5827658e8437415f7e5d412c14549d9c4a033ce1826c23a9a2468
-EBUILD scikits_learn-0.18.1.ebuild 3156 BLAKE2B cf12d6cb19ea6ed324b2f2c3f0898f49a2d3eec9171f0e55ea31c7b03b5f53dd2872688b265e83ec366aba0964448400cd45368df8aa146c808a1eac02f75511 SHA512 563bbcad4b743551457c2b4f90237d112f9dc82e9d6397b833475f60d770920cfa3f80c95f9df03a3c1baaf3bf04d05a13678c89f118a4f5b6c17155918b790e
-EBUILD scikits_learn-0.18.2-r1.ebuild 3304 BLAKE2B 86c64b0f6aa28e5077c77c22fabe6ec92d53b14080686a3b99bafaa12ec5bf3be766ddd9c19879ca6e5bdd3a494c3f42d557e23b1e848136d955c7cd97f7b134 SHA512 a0e14cddbbbdc7897b26fa7a4fdadef83418d261f442b1b03f2d2189532e8896758a1285c69393ec037124b7930fe077bb63bda7777625fb0d0a4aae2c014e72
-EBUILD scikits_learn-0.18.2.ebuild 3168 BLAKE2B 29adca7487cc6bee87bbd388e72883515fbbf1d65785dd1a04f83a83773f014fb57bad33222c59ca4fac1183342da351ed53ccab22f73c092f8c4e48efc9062c SHA512 0ec847d8e4aef38582d5dbcfd2fddaa28aaa36f5007638cac079dae097ead3a1175d5d558b83dc6e7dec51ec128fb1160c13a720baa518c48b134eb8a14bff91
-EBUILD scikits_learn-0.19.0-r1.ebuild 2848 BLAKE2B d20e0645dbe75479b3e923c7fdd7b8e04fe645846af0a3008b053c43dea31c9508fd54f2db2ce9be8d4a59cf0bdc4bf49d9c1c9abaeefb13aedd5121f668aea2 SHA512 3d57c32ad9bfdc4686b406ba2ecb7d5703408a9f3404e44fc49ff6569c01182b2bd60da6b30434ea68ac9bc7602e198e9c154ccf41d469b862e37fbe01898b2a
-EBUILD scikits_learn-0.19.0.ebuild 2846 BLAKE2B 8dc3531bf0800bad86044893ce63261f693380dd9cac6d8dff40bf4d7364f23ceacb77fdc4655bebe6989e2f20f3c23429241629ad0fc9b1a95381001639cfa1 SHA512 ecab717df4619958ff84d36f9cee11969b0e5b7fb54b1ff79bf6794313c966c0dab09f086c0feae6949aa4d1ba8a1cd4fc478bb451d94a64cb60d52ea515a977
+DIST scikit-learn-0.20.2.tar.gz 10275187 BLAKE2B 6865fd101f99930e014f4a2a89616e1ee917df27a5a1b0a931d47503d7df509fe6490799e876a5d68b1cb76a35c6f85e4acbb31a28adfc528720fe9a69e108a7 SHA512 5e0bdea3c40e38880683c6a49cdf2f4c0d40c1f5436c1d8209d613440d5d9d13b9a608e73943a890ef3effaddd930b5c171c45d29700afb8629285ba4aad414f
+DIST scikit-learn-0.20.4.tar.gz 11684276 BLAKE2B 791fd5c7e3ebfdb9bf01524be46b19341b5750fdc5352de9e50cc395a34cf91551825352f18f235b658b55b38829981884fca9f0535a1c505adeb18ac5d87ceb SHA512 a94c254440641a987df1eaec63302639b8e6f56705ec426c350070658141dd574b502eb1e4b94ae9c766c1becfd911f08bb97d5c87d39b0546d8444ed281b06a
+EBUILD scikits_learn-0.19.0-r1.ebuild 2846 BLAKE2B f5ec4d43a2af7fc0c76acec86edb717c7de4a424dc351482e2a579ae29eaca3291a4c302f9c31e87a67acf9a173d180163ef0375419c65a872de2463aaf6b6e4 SHA512 ff0bb216170b8ea1472e68ca8f8451039e7cc8d8589c6c9f88e9c480303c7b11226ca6a5027413f3495572d8146150b1354da196857a040fae5164a207253a91
+EBUILD scikits_learn-0.20.2.ebuild 2869 BLAKE2B 5d31c30890c02139b25724ba6d7ba61ebb331ef91f49536566ed13305901479afcf20d3f513a180c9ad35e9175727c15069305d0defd507ea5c3cba9c5076139 SHA512 afea761a062d61b3ecbef3a7f7c5b51c0faffe49f6157e5a42c3e45b1f83dd45d3ca612229cfde88baf8759004b0b8070358644790773d6aae3a01e1f429c210
+EBUILD scikits_learn-0.20.4.ebuild 2869 BLAKE2B 5d31c30890c02139b25724ba6d7ba61ebb331ef91f49536566ed13305901479afcf20d3f513a180c9ad35e9175727c15069305d0defd507ea5c3cba9c5076139 SHA512 afea761a062d61b3ecbef3a7f7c5b51c0faffe49f6157e5a42c3e45b1f83dd45d3ca612229cfde88baf8759004b0b8070358644790773d6aae3a01e1f429c210
MISC metadata.xml 605 BLAKE2B 46a657647a79f0a23cc07b39877b1e57158cdf94d9478c3aa4e7af0dbdbf60acf996d1431076697db764d42bec0d5e0517c1247e91dc36e85823a45784d00e71 SHA512 e14b6835108fa80eca44bab635c9a229da65f048ffcee16cd4ad7736c3a0fb364c94ff0bd9630030653bd3cd78d8dced191c43c7e5aacb3a7f6e61ac45b5bb3d
diff --git a/sci-libs/scikits_learn/files/scikits_learn-0.14.1-system-cblas.patch b/sci-libs/scikits_learn/files/scikits_learn-0.14.1-system-cblas.patch
deleted file mode 100644
index 96c6cc2dbde5..000000000000
--- a/sci-libs/scikits_learn/files/scikits_learn-0.14.1-system-cblas.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- sklearn/setup.py.orig 2013-08-08 13:54:08.310879167 -0700
-+++ sklearn/setup.py 2013-08-08 13:52:59.808456423 -0700
-@@ -68,14 +68,6 @@
- libraries=libraries,
- )
-
-- # some libs needs cblas, fortran-compiled BLAS will not be sufficient
-- blas_info = get_info('blas_opt', 0)
-- if (not blas_info) or (
-- ('NO_ATLAS_INFO', 1) in blas_info.get('define_macros', [])):
-- config.add_library('cblas',
-- sources=[join('src', 'cblas', '*.c')])
-- warnings.warn(BlasNotFoundError.__doc__)
--
- # the following packages depend on cblas, so they have to be build
- # after the above.
- config.add_subpackage('linear_model')
---- sklearn/_build_utils.py.orig 2013-08-08 14:01:35.994589269 -0700
-+++ sklearn/_build_utils.py 2013-08-08 12:19:41.875967870 -0700
-@@ -23,7 +23,7 @@
- return False
-
- blas_info = get_info('blas_opt', 0)
-- if (not blas_info) or atlas_not_found(blas_info):
-+ if (not blas_info):
- cblas_libs = ['cblas']
- blas_info.pop('libraries', None)
- else:
diff --git a/sci-libs/scikits_learn/files/scikits_learn-0.17.1-system-cblas.patch b/sci-libs/scikits_learn/files/scikits_learn-0.17.1-system-cblas.patch
deleted file mode 100644
index 42657a7adacc..000000000000
--- a/sci-libs/scikits_learn/files/scikits_learn-0.17.1-system-cblas.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur scikit-learn-0.17.1.orig/sklearn/_build_utils.py scikit-learn-0.17.1/sklearn/_build_utils.py
---- scikit-learn-0.17.1.orig/sklearn/_build_utils.py 2016-03-09 00:27:54.756813784 +0000
-+++ scikit-learn-0.17.1/sklearn/_build_utils.py 2016-03-09 00:30:09.605118512 +0000
-@@ -23,7 +23,7 @@
- return False
-
- blas_info = get_info('blas_opt', 0)
-- if (not blas_info) or atlas_not_found(blas_info):
-+ if (not blas_info):
- cblas_libs = ['cblas']
- blas_info.pop('libraries', None)
- else:
-diff -Nur scikit-learn-0.17.1.orig/sklearn/setup.py scikit-learn-0.17.1/sklearn/setup.py
---- scikit-learn-0.17.1.orig/sklearn/setup.py 2016-03-09 00:27:54.806813156 +0000
-+++ scikit-learn-0.17.1/sklearn/setup.py 2016-03-09 00:29:28.215638848 +0000
-@@ -58,14 +58,6 @@
- libraries=libraries,
- )
-
-- # some libs needs cblas, fortran-compiled BLAS will not be sufficient
-- blas_info = get_info('blas_opt', 0)
-- if (not blas_info) or (
-- ('NO_ATLAS_INFO', 1) in blas_info.get('define_macros', [])):
-- config.add_library('cblas',
-- sources=[join('src', 'cblas', '*.c')])
-- warnings.warn(BlasNotFoundError.__doc__)
--
- # the following packages depend on cblas, so they have to be build
- # after the above.
- config.add_subpackage('linear_model')
diff --git a/sci-libs/scikits_learn/files/scikits_learn-0.20.2-fix-cdfast.patch b/sci-libs/scikits_learn/files/scikits_learn-0.20.2-fix-cdfast.patch
new file mode 100644
index 000000000000..1d1de4a3e0e5
--- /dev/null
+++ b/sci-libs/scikits_learn/files/scikits_learn-0.20.2-fix-cdfast.patch
@@ -0,0 +1,42 @@
+--- scikit-learn-0.20.3.orig/sklearn/linear_model/cd_fast.c 2019-08-09 03:05:05.351926119 +0500
++++ scikit-learn-0.20.3/sklearn/linear_model/cd_fast.c 2019-08-09 03:05:35.022926006 +0500
+@@ -4889,7 +4889,7 @@
+
+ static PyObject *__pyx_pf_7sklearn_12linear_model_7cd_fast_8enet_coordinate_descent(CYTHON_UNUSED PyObject *__pyx_self, __Pyx_memviewslice __pyx_v_w, float __pyx_v_alpha, float __pyx_v_beta, __Pyx_memviewslice __pyx_v_X, __Pyx_memviewslice __pyx_v_y, int __pyx_v_max_iter, float __pyx_v_tol, PyObject *__pyx_v_rng, int __pyx_v_random, int __pyx_v_positive) {
+ PyObject *__pyx_v_dtype = NULL;
+- void (*__pyx_v_gemv)(enum CBLAS_ORDER, enum CBLAS_TRANSPOSE, int, int, float, float *, int, float *, int, float, float *, int);
++ void (*__pyx_v_gemv)(CBLAS_ORDER, CBLAS_TRANSPOSE, int, int, float, float *, int, float *, int, float, float *, int);
+ float (*__pyx_v_dot)(int, float *, int, float *, int);
+ void (*__pyx_v_axpy)(int, float, float *, int, float *, int);
+ float (*__pyx_v_asum)(int, float *, int);
+@@ -6279,7 +6279,7 @@
+
+ static PyObject *__pyx_pf_7sklearn_12linear_model_7cd_fast_10enet_coordinate_descent(CYTHON_UNUSED PyObject *__pyx_self, __Pyx_memviewslice __pyx_v_w, double __pyx_v_alpha, double __pyx_v_beta, __Pyx_memviewslice __pyx_v_X, __Pyx_memviewslice __pyx_v_y, int __pyx_v_max_iter, double __pyx_v_tol, PyObject *__pyx_v_rng, int __pyx_v_random, int __pyx_v_positive) {
+ PyObject *__pyx_v_dtype = NULL;
+- void (*__pyx_v_gemv)(enum CBLAS_ORDER, enum CBLAS_TRANSPOSE, int, int, double, double *, int, double *, int, double, double *, int);
++ void (*__pyx_v_gemv)(CBLAS_ORDER, CBLAS_TRANSPOSE, int, int, double, double *, int, double *, int, double, double *, int);
+ double (*__pyx_v_dot)(int, double *, int, double *, int);
+ void (*__pyx_v_axpy)(int, double, double *, int, double *, int);
+ double (*__pyx_v_asum)(int, double *, int);
+@@ -16246,8 +16246,8 @@
+ CYTHON_UNUSED float (*__pyx_v_asum)(int, float *, int);
+ void (*__pyx_v_copy)(int, float *, int, float *, int);
+ void (*__pyx_v_scal)(int, float, float *, int);
+- void (*__pyx_v_ger)(enum CBLAS_ORDER, int, int, float, float *, int, float *, int, float *, int);
+- void (*__pyx_v_gemv)(enum CBLAS_ORDER, enum CBLAS_TRANSPOSE, int, int, float, float *, int, float *, int, float, float *, int);
++ void (*__pyx_v_ger)(CBLAS_ORDER, int, int, float, float *, int, float *, int, float *, int);
++ void (*__pyx_v_gemv)(CBLAS_ORDER, CBLAS_TRANSPOSE, int, int, float, float *, int, float *, int, float, float *, int);
+ unsigned int __pyx_v_n_samples;
+ unsigned int __pyx_v_n_features;
+ unsigned int __pyx_v_n_tasks;
+@@ -17965,8 +17965,8 @@
+ CYTHON_UNUSED double (*__pyx_v_asum)(int, double *, int);
+ void (*__pyx_v_copy)(int, double *, int, double *, int);
+ void (*__pyx_v_scal)(int, double, double *, int);
+- void (*__pyx_v_ger)(enum CBLAS_ORDER, int, int, double, double *, int, double *, int, double *, int);
+- void (*__pyx_v_gemv)(enum CBLAS_ORDER, enum CBLAS_TRANSPOSE, int, int, double, double *, int, double *, int, double, double *, int);
++ void (*__pyx_v_ger)(CBLAS_ORDER, int, int, double, double *, int, double *, int, double *, int);
++ void (*__pyx_v_gemv)(CBLAS_ORDER, CBLAS_TRANSPOSE, int, int, double, double *, int, double *, int, double, double *, int);
+ unsigned int __pyx_v_n_samples;
+ unsigned int __pyx_v_n_features;
+ unsigned int __pyx_v_n_tasks;
diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild
deleted file mode 100644
index e83910a436ba..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1 flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="https://scikit-learn.org"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
- sci-libs/scikits[${PYTHON_USEDEP}]
- >=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
- virtual/blas
- virtual/cblas
- virtual/python-funcsigs[${PYTHON_USEDEP}]
- "
-DEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/numpy[lapack,${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- virtual/blas
- virtual/cblas
- doc? (
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- )"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}/${P}-system-cblas.patch" )
-
-python_prepare_all() {
- # bug #397605
- [[ ${CHOST} == *-darwin* ]] \
- && append-ldflags -bundle "-undefined dynamic_lookup" \
- || append-ldflags -shared
-
- # scikits-learn now uses the horrible numpy.distutils automagic
- export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
- # use system joblib
- rm -r sklearn/externals/joblib/* || die
- echo "from joblib import *" > sklearn/externals/joblib/__init__.py
- sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die
- sed -i -e 's/..externals.joblib/ joblib/g' \
- sklearn/cross_validation.py \
- sklearn/decomposition/tests/test_sparse_pca.py \
- sklearn/metrics/pairwise.py || die
-
- rm sklearn/externals/funcsigs.py || die
- rm sklearn/externals/odict.py || die
- sed -e 's:from ..externals.funcsigs import signature:from funcsigs import signature:g' \
- -i sklearn/utils/fixes.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_compile_all() {
- if use doc; then
- cd "${S}/doc" || die
- local d="${BUILD_DIR}"/lib
- ln -s "${S}"/sklearn/datasets/{data,descr,images} \
- "${d}"/sklearn/datasets || die
- VARTEXFONTS="${T}"/fonts \
- MPLCONFIGDIR="${BUILD_DIR}" \
- PYTHONPATH="${d}" \
- emake html
- rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
- fi
-}
-
-python_test() {
- # doc builds and runs tests
- use doc && return
- distutils_install_for_testing ${SCIPY_FCONFIG}
- esetup.py \
- install --root="${T}/test-${EPYTHON}" \
- --no-compile ${SCIPY_FCONFIG}
- pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
- nosetests -v sklearn --exe || die
- popd > /dev/null
-}
-
-python_install() {
- distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
- find "${S}" -name \*LICENSE.txt -delete
- insinto /usr/share/doc/${PF}
- use doc && doins -r doc/_build/html
- use examples && doins -r examples
- distutils-r1_python_install_all
-}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
deleted file mode 100644
index e8b01caac0bd..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils multilib flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="https://scikit-learn.org"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
- sci-libs/scikits[${PYTHON_USEDEP}]
- >=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
- virtual/blas
- virtual/cblas
- virtual/python-funcsigs[${PYTHON_USEDEP}]
- "
-DEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/numpy[lapack,${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- virtual/blas
- virtual/cblas
- doc? (
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- )"
-
-S="${WORKDIR}/${MYP}"
-
-python_prepare_all() {
- # bug #397605
- [[ ${CHOST} == *-darwin* ]] \
- && append-ldflags -bundle "-undefined dynamic_lookup" \
- || append-ldflags -shared
-
- # scikits-learn now uses the horrible numpy.distutils automagic
- export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
- # use system joblib
- rm -r sklearn/externals/joblib/* || die
- echo "from joblib import *" > sklearn/externals/joblib/__init__.py
- sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die
- sed -i -e 's/..externals.joblib/joblib/g' \
- sklearn/decomposition/tests/test_sparse_pca.py \
- sklearn/metrics/pairwise.py || die
-
- rm sklearn/externals/funcsigs.py || die
- rm sklearn/externals/odict.py || die
- sed \
- -e 's:from ..externals.funcsigs import signature:from funcsigs import signature:g' \
- -i sklearn/utils/fixes.py || die
-
- # use gentoo cblas infrastructure
- epatch "${FILESDIR}"/${PN}-0.14.1-system-cblas.patch
-
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_compile_all() {
- if use doc; then
- cd "${S}/doc" || die
- local d="${BUILD_DIR}"/lib
- ln -s "${S}"/sklearn/datasets/{data,descr,images} \
- "${d}"/sklearn/datasets || die
- VARTEXFONTS="${T}"/fonts \
- MPLCONFIGDIR="${BUILD_DIR}" \
- PYTHONPATH="${d}" \
- emake html
- rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
- fi
-}
-
-python_test() {
- # doc builds and runs tests
- use doc && return
- distutils_install_for_testing ${SCIPY_FCONFIG}
- esetup.py \
- install --root="${T}/test-${EPYTHON}" \
- --no-compile ${SCIPY_FCONFIG}
- pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
- nosetests -v sklearn --exe || die
- popd > /dev/null
-}
-
-python_install() {
- distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
- find "${S}" -name \*LICENSE.txt -delete
- use doc && HTML_DOCS=( doc/_build/html/. )
- use examples && EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
deleted file mode 100644
index 1a04525ec154..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1 flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="https://scikit-learn.org"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
- sci-libs/scikits[${PYTHON_USEDEP}]
- >=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
- virtual/blas
- virtual/cblas
- virtual/python-funcsigs[${PYTHON_USEDEP}]
- "
-DEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/numpy[lapack,${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- virtual/blas
- virtual/cblas
- doc? (
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- )"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}/${P}-system-cblas.patch" )
-
-python_prepare_all() {
- # bug #397605
- [[ ${CHOST} == *-darwin* ]] \
- && append-ldflags -bundle "-undefined dynamic_lookup" \
- || append-ldflags -shared
-
- # scikits-learn now uses the horrible numpy.distutils automagic
- export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
- # remove bundled cblas
- rm -r sklearn/src || die
-
- # use system joblib
- rm -r sklearn/externals/joblib || die
- sed -i -e '/joblib/d' sklearn/externals/setup.py || die
- for f in sklearn/{*/,}*.py; do
- sed -r -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
- -e 's/from (sklearn|\.|)\.externals import/import/' -i $f || die
- done
-
- rm sklearn/externals/funcsigs.py || die
- rm sklearn/externals/odict.py || die
- for f in sklearn/{utils/fixes.py,gaussian_process/{tests/test_,}kernels.py}; do
- sed -r -e 's/from (sklearn|\.|)\.externals\.funcsigs/from funcsigs/' -i $f || die
- done
-
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_compile_all() {
- if use doc; then
- cd "${S}/doc" || die
- local d="${BUILD_DIR}"/lib
- ln -s "${S}"/sklearn/datasets/{data,descr,images} \
- "${d}"/sklearn/datasets || die
- VARTEXFONTS="${T}"/fonts \
- MPLCONFIGDIR="${BUILD_DIR}" \
- PYTHONPATH="${d}" \
- emake html
- rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
- fi
-}
-
-python_test() {
- # doc builds and runs tests
- use doc && return
- distutils_install_for_testing ${SCIPY_FCONFIG}
- esetup.py \
- install --root="${T}/test-${EPYTHON}" \
- --no-compile ${SCIPY_FCONFIG}
- pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
- nosetests -v sklearn --exe || die
- popd > /dev/null
-}
-
-python_install() {
- distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
- find "${S}" -name \*LICENSE.txt -delete
- insinto /usr/share/doc/${PF}
- use doc && doins -r doc/_build/html
- use examples && doins -r examples
- distutils-r1_python_install_all
-}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild
deleted file mode 100644
index 191789ac6c0f..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="https://scikit-learn.org"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
- sci-libs/scikits[${PYTHON_USEDEP}]
- >=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
- virtual/blas
- virtual/cblas
- virtual/python-funcsigs[${PYTHON_USEDEP}]
- "
-DEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/numpy[lapack,${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- virtual/blas
- virtual/cblas
- doc? (
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- )"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.18.1-system-cblas.patch" )
-
-python_prepare_all() {
- # bug #397605
- [[ ${CHOST} == *-darwin* ]] \
- && append-ldflags -bundle "-undefined dynamic_lookup" \
- || append-ldflags -shared
-
- # scikits-learn now uses the horrible numpy.distutils automagic
- export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
- # remove bundled cblas
- rm -r sklearn/src || die
-
- # use system joblib
- rm -r sklearn/externals/joblib || die
- sed -i -e '/joblib/d' sklearn/externals/setup.py || die
- for f in sklearn/{*/,}*.py; do
- sed -r -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
- -e 's/from (sklearn|\.|)\.externals import/import/' -i $f || die
- done
-
- rm sklearn/externals/funcsigs.py || die
- rm sklearn/externals/odict.py || die
- for f in sklearn/{utils/fixes.py,gaussian_process/{tests/test_,}kernels.py}; do
- sed -r -e 's/from (sklearn|\.|)\.externals\.funcsigs/from funcsigs/' -i $f || die
- done
-
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_compile_all() {
- if use doc; then
- cd "${S}/doc" || die
- local d="${BUILD_DIR}"/lib
- ln -s "${S}"/sklearn/datasets/{data,descr,images} \
- "${d}"/sklearn/datasets || die
- VARTEXFONTS="${T}"/fonts \
- MPLCONFIGDIR="${BUILD_DIR}" \
- PYTHONPATH="${d}" \
- emake html
- rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
- fi
-}
-
-python_test() {
- # doc builds and runs tests
- use doc && return
- distutils_install_for_testing ${SCIPY_FCONFIG}
- esetup.py \
- install --root="${T}/test-${EPYTHON}" \
- --no-compile ${SCIPY_FCONFIG}
- pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
- nosetests -v sklearn --exe || die
- popd > /dev/null
-}
-
-python_install() {
- distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
- find "${S}" -name \*LICENSE.txt -delete
- insinto /usr/share/doc/${PF}
- use doc && doins -r doc/_build/html
- use examples && doins -r examples
- distutils-r1_python_install_all
-}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
index cc0019d518d8..991b1ca7d29e 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
inherit distutils-r1 flag-o-matic
diff --git a/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
index f6a48d144c7c..a7cda1c289c1 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
inherit distutils-r1 flag-o-matic
@@ -11,14 +11,13 @@ MYPN="${PN/scikits_/scikit-}"
MYP="${MYPN}-${PV}"
DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="https://scikit-learn.org"
+HOMEPAGE="http://scikit-learn.org"
SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
IUSE="examples test"
-RESTRICT="!test? ( test )"
# tried to unbundle virtual/python-funcsigs, funcsigs, odict
# but it is a large mess to maintain
@@ -44,7 +43,8 @@ DEPEND="
S="${WORKDIR}/${MYP}"
-PATCHES=( "${FILESDIR}"/${PN}-0.18.1-system-cblas.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.18.1-system-cblas.patch
+ "${FILESDIR}"/${PN}-0.20.2-fix-cdfast.patch )
python_prepare_all() {
# bug #397605
@@ -56,7 +56,7 @@ python_prepare_all() {
export SCIPY_FCONFIG="config_fc --noopt --noarch"
# remove bundled cblas
- rm -r sklearn/src || die
+ rm -rf sklearn/src || die "failed to remove bundled cblas"
# commented out, since it is a mess to maintain
# use system joblib
diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.2-r1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
index 854f19af4e33..a7cda1c289c1 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.18.2-r1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
inherit distutils-r1 flag-o-matic
@@ -11,14 +11,13 @@ MYPN="${PN/scikits_/scikit-}"
MYP="${MYPN}-${PV}"
DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="https://scikit-learn.org"
+HOMEPAGE="http://scikit-learn.org"
SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
# tried to unbundle virtual/python-funcsigs, funcsigs, odict
# but it is a large mess to maintain
@@ -40,15 +39,12 @@ DEPEND="
sci-libs/scipy[${PYTHON_USEDEP}]
virtual/blas:=
virtual/cblas:=
- doc? (
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- )
"
S="${WORKDIR}/${MYP}"
-PATCHES=( "${FILESDIR}/${PN}-0.18.1-system-cblas.patch" )
+PATCHES=( "${FILESDIR}"/${PN}-0.18.1-system-cblas.patch
+ "${FILESDIR}"/${PN}-0.20.2-fix-cdfast.patch )
python_prepare_all() {
# bug #397605
@@ -60,7 +56,7 @@ python_prepare_all() {
export SCIPY_FCONFIG="config_fc --noopt --noarch"
# remove bundled cblas
- rm -r sklearn/src || die
+ rm -rf sklearn/src || die "failed to remove bundled cblas"
# commented out, since it is a mess to maintain
# use system joblib
@@ -84,21 +80,6 @@ python_compile() {
distutils-r1_python_compile ${SCIPY_FCONFIG}
}
-python_compile_all() {
- if use doc; then
- cd "${S}/doc" || die
- local d="${BUILD_DIR}/lib"
- ln -s \
- "${S}"/sklearn/datasets/{data,descr,images} \
- "${d}"/sklearn/datasets || die
- VARTEXFONTS="${T}"/fonts \
- MPLCONFIGDIR="${BUILD_DIR}" \
- PYTHONPATH="${d}" \
- emake html
- rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
- fi
-}
-
python_test() {
# doc builds and runs tests
use doc && return
@@ -117,8 +98,10 @@ python_install() {
python_install_all() {
find "${S}" -name \*LICENSE.txt -delete
- insinto /usr/share/doc/${PF}
- use doc && doins -r doc/_build/html
- use examples && doins -r examples
distutils-r1_python_install_all
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 16:25:42 +0000