* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/files/, sci-libs/scikits_learn/
@ 2017-02-20 1:05 Benda XU
0 siblings, 0 replies; 2+ messages in thread
From: Benda XU @ 2017-02-20 1:05 UTC (permalink / raw
To: gentoo-commits
commit: dc6e7afa6c153f914af48996a1b4ec9bd4da3f76
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 01:04:43 2017 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 01:05:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc6e7afa
sci-libs/scikits_learn: remove bundled cblas.
use the system one.
Package-Manager: portage-2.3.3
.../files/scikits_learn-0.18.1-system-cblas.patch | 32 ++++++++++++++++++++++
sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild | 5 ++++
2 files changed, 37 insertions(+)
diff --git a/sci-libs/scikits_learn/files/scikits_learn-0.18.1-system-cblas.patch b/sci-libs/scikits_learn/files/scikits_learn-0.18.1-system-cblas.patch
new file mode 100644
index 0000000000..e60f64947b
--- /dev/null
+++ b/sci-libs/scikits_learn/files/scikits_learn-0.18.1-system-cblas.patch
@@ -0,0 +1,32 @@
+Index: scikit-learn-0.18.1/sklearn/_build_utils/__init__.py
+===================================================================
+--- scikit-learn-0.18.1.orig/sklearn/_build_utils/__init__.py
++++ scikit-learn-0.18.1/sklearn/_build_utils/__init__.py
+@@ -31,7 +31,7 @@ def get_blas_info():
+ 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:
+Index: scikit-learn-0.18.1/sklearn/setup.py
+===================================================================
+--- scikit-learn-0.18.1.orig/sklearn/setup.py
++++ scikit-learn-0.18.1/sklearn/setup.py
+@@ -63,14 +63,6 @@ def configuration(parent_package='', top
+ 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/scikits_learn-0.18.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
index 865735d2a0..10e75acb5e 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
@@ -46,6 +46,8 @@ DEPEND="
S="${WORKDIR}/${MYP}"
+PATCHES=( "${FILESDIR}/${P}-system-cblas.patch" )
+
python_prepare_all() {
# bug #397605
[[ ${CHOST} == *-darwin* ]] \
@@ -55,6 +57,9 @@ python_prepare_all() {
# 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/files/, sci-libs/scikits_learn/
@ 2020-11-09 14:02 Benda XU
0 siblings, 0 replies; 2+ messages in thread
From: Benda XU @ 2020-11-09 14:02 UTC (permalink / raw
To: gentoo-commits
commit: 7599874114b03ecbc9592d9792e9379a3e8a760b
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Thu Oct 15 14:26:05 2020 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Nov 9 14:01:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75998741
sci-libs/scikits_learn: version bump to 0.23.2
drop dependency on sci-libs/scikits
drop old versions.
Closes: https://bugs.gentoo.org/692662
Closes: https://bugs.gentoo.org/626796
Closes: https://bugs.gentoo.org/614558
Closes: https://bugs.gentoo.org/469924
Reported-by: Zoltan Puskas, Roman Yurchak, Крыськов Денис
Reported-by: Roman Yurchak, Neil, Tomáš Mózes, Thomas Kemmer
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
sci-libs/scikits_learn/Manifest | 4 +-
.../files/scikits_learn-0.18.1-system-cblas.patch | 32 ------
.../files/scikits_learn-0.20.2-fix-cdfast.patch | 42 --------
.../scikits_learn/scikits_learn-0.19.0-r1.ebuild | 107 --------------------
sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild | 109 ---------------------
sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild | 109 ---------------------
...p1.ebuild => scikits_learn-0.22.2_p1-r1.ebuild} | 8 +-
....22.2_p1.ebuild => scikits_learn-0.23.2.ebuild} | 35 +++----
8 files changed, 15 insertions(+), 431 deletions(-)
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index 87d114ec5e6..d89024ada31 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -1,4 +1,2 @@
-DIST scikit-learn-0.19.0.tar.gz 9341628 BLAKE2B c9e0c12558e81efb6f5cfddead028980b0019d2f6d0fdce5662c9138ec3a5b2a3d30b022a5713578bc7effd09894006e8f7f60a3e038ca66297502d9d4212686 SHA512 1b88bc043b08de9b5bb1f3814b8101c73ced010cf94bd725fb69e1ef95b4a9597a34de4a19f84fbbf63e54d47e95b3ff498d611234fcdfcaa5e4e3cf696289d2
-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
DIST scikits_learn-0.22.2_p1.tar.gz 7034850 BLAKE2B 41c362ef6594e837a9fc798837e666fbb51e33954fdf700292650204fd9d1ab4fc4d1695890d02a24ad68f4dcc2d3cde8f0827eca70c6fb9a6f0e5c0d9c04fd5 SHA512 20bcda5c65f76bce9b71c5b5fb1b499f7f3a7a3f6fa5fade80a38dc658cb434e16e9d5a4906a9657157a5cc90a6d51080575d6e510207baa9f8b06c4fa761d5b
+DIST scikits_learn-0.23.2.tar.gz 7190564 BLAKE2B db90e3d05d9b563c6cd98a6820c27b541e757e3fb6c25262b720842811b9e26d41a4a9c1d73e675714573d84dab799a0c450e768f4a41a39a6a61f6930c4c79a SHA512 e9797185b1b9def3ee5525e9b72742784aeb78fe8b069bb5aeab1d0f4513cf738c4489ed894274606dea9d6a32ccd3df26170ce1951e443dc77f9287c372e8c5
diff --git a/sci-libs/scikits_learn/files/scikits_learn-0.18.1-system-cblas.patch b/sci-libs/scikits_learn/files/scikits_learn-0.18.1-system-cblas.patch
deleted file mode 100644
index e60f64947b0..00000000000
--- a/sci-libs/scikits_learn/files/scikits_learn-0.18.1-system-cblas.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: scikit-learn-0.18.1/sklearn/_build_utils/__init__.py
-===================================================================
---- scikit-learn-0.18.1.orig/sklearn/_build_utils/__init__.py
-+++ scikit-learn-0.18.1/sklearn/_build_utils/__init__.py
-@@ -31,7 +31,7 @@ def get_blas_info():
- 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:
-Index: scikit-learn-0.18.1/sklearn/setup.py
-===================================================================
---- scikit-learn-0.18.1.orig/sklearn/setup.py
-+++ scikit-learn-0.18.1/sklearn/setup.py
-@@ -63,14 +63,6 @@ def configuration(parent_package='', top
- 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
deleted file mode 100644
index 1d1de4a3e0e..00000000000
--- a/sci-libs/scikits_learn/files/scikits_learn-0.20.2-fix-cdfast.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- 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.19.0-r1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
deleted file mode 100644
index 87abf6b9c1e..00000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-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="examples test"
-RESTRICT="!test? ( test )"
-
-# tried to unbundle virtual/python-funcsigs, funcsigs, odict
-# but it is a large mess to maintain
-
-RDEPEND="
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/numpy[lapack,${PYTHON_USEDEP}]
- sci-libs/scikits[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- virtual/blas:=
- virtual/cblas:=
-"
-
-DEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/numpy[lapack,${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- virtual/blas:=
- virtual/cblas:=
-"
-
-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
-
- # commented out, since it is a mess to maintain
- # 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
-
- # use system funcsigs and odict
- #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_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
- JOBLIB_MULTIPROCESSING=2 SKLEARN_SKIP_NETWORK_TESTS=1 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
- distutils-r1_python_install_all
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
-}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
deleted file mode 100644
index 72823168329..00000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_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"
-IUSE="examples test"
-
-RESTRICT="!test? ( test )"
-
-# tried to unbundle virtual/python-funcsigs, funcsigs, odict
-# but it is a large mess to maintain
-
-RDEPEND="
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/numpy[lapack,${PYTHON_USEDEP}]
- sci-libs/scikits[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- virtual/blas:=
- virtual/cblas:=
-"
-
-DEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/numpy[lapack,${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- virtual/blas:=
- virtual/cblas:=
-"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.18.1-system-cblas.patch
- "${FILESDIR}"/${PN}-0.20.2-fix-cdfast.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 -rf sklearn/src || die "failed to remove bundled cblas"
-
- # commented out, since it is a mess to maintain
- # 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
-
- # use system funcsigs and odict
- #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_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
- JOBLIB_MULTIPROCESSING=2 SKLEARN_SKIP_NETWORK_TESTS=1 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
- distutils-r1_python_install_all
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
-}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
deleted file mode 100644
index 72823168329..00000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_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"
-IUSE="examples test"
-
-RESTRICT="!test? ( test )"
-
-# tried to unbundle virtual/python-funcsigs, funcsigs, odict
-# but it is a large mess to maintain
-
-RDEPEND="
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/numpy[lapack,${PYTHON_USEDEP}]
- sci-libs/scikits[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- virtual/blas:=
- virtual/cblas:=
-"
-
-DEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/numpy[lapack,${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- virtual/blas:=
- virtual/cblas:=
-"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.18.1-system-cblas.patch
- "${FILESDIR}"/${PN}-0.20.2-fix-cdfast.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 -rf sklearn/src || die "failed to remove bundled cblas"
-
- # commented out, since it is a mess to maintain
- # 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
-
- # use system funcsigs and odict
- #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_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
- JOBLIB_MULTIPROCESSING=2 SKLEARN_SKIP_NETWORK_TESTS=1 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
- distutils-r1_python_install_all
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
-}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1-r1.ebuild
similarity index 93%
copy from sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
copy to sci-libs/scikits_learn/scikits_learn-0.22.2_p1-r1.ebuild
index b60be666ce0..d191b819ec3 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1-r1.ebuild
@@ -24,9 +24,9 @@ IUSE="examples"
RDEPEND="
dev-python/wheel[${PYTHON_USEDEP}]
dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/joblib[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/scipy[${PYTHON_USEDEP}]
- sci-libs/scikits[${PYTHON_USEDEP}]
virtual/blas:=
virtual/cblas:=
"
@@ -34,12 +34,6 @@ DEPEND="
virtual/blas:=
virtual/cblas:=
"
-BDEPEND="
- test? (
- ${RDEPEND}
- dev-python/joblib[${PYTHON_USEDEP}]
- )
-"
distutils_enable_tests pytest
diff --git a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.23.2.ebuild
similarity index 71%
rename from sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
rename to sci-libs/scikits_learn/scikits_learn-0.23.2.ebuild
index b60be666ce0..55d42a949aa 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.23.2.ebuild
@@ -3,42 +3,34 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
-MY_PV="${PV//_p/.post}"
-MY_PN="${PN//s_/-}"
-
DESCRIPTION="Machine learning library for Python"
HOMEPAGE="https://scikit-learn.org/stable/
https://github.com/scikit-learn/scikit-learn"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-#ffhttps://github.com/scikit-learn/scikit-learn/archive/0.22.2.post1.tar.gz
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
+SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/scikit-learn-${PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="examples"
+DEPEND="
+ virtual/blas:=
+ virtual/cblas:=
+"
RDEPEND="
+ ${DEPEND}
dev-python/wheel[${PYTHON_USEDEP}]
dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/joblib[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/scipy[${PYTHON_USEDEP}]
- sci-libs/scikits[${PYTHON_USEDEP}]
- virtual/blas:=
- virtual/cblas:=
-"
-DEPEND="
- virtual/blas:=
- virtual/cblas:=
-"
-BDEPEND="
- test? (
- ${RDEPEND}
- dev-python/joblib[${PYTHON_USEDEP}]
- )
+ dev-python/threadpoolctl[${PYTHON_USEDEP}]
"
distutils_enable_tests pytest
@@ -73,7 +65,6 @@ python_install_all() {
distutils-r1_python_install_all
if use examples; then
dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
fi
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-09 14:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-20 1:05 [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/files/, sci-libs/scikits_learn/ Benda XU
-- strict thread matches above, loose matches on Subject: below --
2020-11-09 14:02 Benda XU
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox