commit: 2bd98fe68a3d861306eebab53a83a53de754153e Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> AuthorDate: Wed Dec 23 20:11:48 2020 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Sat May 29 17:41:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bd98fe6
sci-libs/scikit-learn: version bump to 0.24.1 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> Closes: https://github.com/gentoo/gentoo/pull/18790 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> sci-libs/scikit-learn/Manifest | 1 + .../files/scikit-learn-0.24.1-no-O3.patch | 55 ++++++++++++++++++++ sci-libs/scikit-learn/scikit-learn-0.24.1.ebuild | 58 ++++++++++++++++++++++ 3 files changed, 114 insertions(+) diff --git a/sci-libs/scikit-learn/Manifest b/sci-libs/scikit-learn/Manifest index 0a578c3504c..3569f86587e 100644 --- a/sci-libs/scikit-learn/Manifest +++ b/sci-libs/scikit-learn/Manifest @@ -1,2 +1,3 @@ DIST scikit-learn-0.22.2_p1.tar.gz 7034850 BLAKE2B 41c362ef6594e837a9fc798837e666fbb51e33954fdf700292650204fd9d1ab4fc4d1695890d02a24ad68f4dcc2d3cde8f0827eca70c6fb9a6f0e5c0d9c04fd5 SHA512 20bcda5c65f76bce9b71c5b5fb1b499f7f3a7a3f6fa5fade80a38dc658cb434e16e9d5a4906a9657157a5cc90a6d51080575d6e510207baa9f8b06c4fa761d5b DIST scikit-learn-0.23.2.tar.gz 7190564 BLAKE2B db90e3d05d9b563c6cd98a6820c27b541e757e3fb6c25262b720842811b9e26d41a4a9c1d73e675714573d84dab799a0c450e768f4a41a39a6a61f6930c4c79a SHA512 e9797185b1b9def3ee5525e9b72742784aeb78fe8b069bb5aeab1d0f4513cf738c4489ed894274606dea9d6a32ccd3df26170ce1951e443dc77f9287c372e8c5 +DIST scikit-learn-0.24.1.tar.gz 7472636 BLAKE2B 46db531866f5bd7ddf383b5de076d8cc8375fe17220d9849551e978727cabfdc10e42ae7ca6df08b7af013dac4b72e85291b50e60485d368ed6480fb844e2f40 SHA512 53b750c6c7b3bf86527acb0559ea6cd7cad86bdf86b4ab78b76f5559901152e40e0e92f4f481c5d86a3162ea109a2aea35faf11df7fb3c975cf8e26c195cad92 diff --git a/sci-libs/scikit-learn/files/scikit-learn-0.24.1-no-O3.patch b/sci-libs/scikit-learn/files/scikit-learn-0.24.1-no-O3.patch new file mode 100644 index 00000000000..58caf95a9cf --- /dev/null +++ b/sci-libs/scikit-learn/files/scikit-learn-0.24.1-no-O3.patch @@ -0,0 +1,55 @@ +diff --git a/sklearn/manifold/setup.py b/sklearn/manifold/setup.py +index 0db2d5d..fb4fc38 100644 +--- a/sklearn/manifold/setup.py ++++ b/sklearn/manifold/setup.py +@@ -15,14 +15,14 @@ def configuration(parent_package="", top_path=None): + config.add_extension("_utils", + sources=["_utils.pyx"], + include_dirs=[numpy.get_include()], +- libraries=libraries, +- extra_compile_args=["-O3"]) ++ libraries=libraries) ++ + + config.add_extension("_barnes_hut_tsne", + sources=["_barnes_hut_tsne.pyx"], + include_dirs=[numpy.get_include()], +- libraries=libraries, +- extra_compile_args=['-O3']) ++ libraries=libraries) ++ + + config.add_subpackage('tests') + +diff --git a/sklearn/tree/setup.py b/sklearn/tree/setup.py +index 079ae9d..b38ee4b 100644 +--- a/sklearn/tree/setup.py ++++ b/sklearn/tree/setup.py +@@ -12,23 +12,19 @@ def configuration(parent_package="", top_path=None): + config.add_extension("_tree", + sources=["_tree.pyx"], + include_dirs=[numpy.get_include()], +- libraries=libraries, +- extra_compile_args=["-O3"]) ++ libraries=libraries) + config.add_extension("_splitter", + sources=["_splitter.pyx"], + include_dirs=[numpy.get_include()], +- libraries=libraries, +- extra_compile_args=["-O3"]) ++ libraries=libraries) + config.add_extension("_criterion", + sources=["_criterion.pyx"], + include_dirs=[numpy.get_include()], +- libraries=libraries, +- extra_compile_args=["-O3"]) ++ libraries=libraries) + config.add_extension("_utils", + sources=["_utils.pyx"], + include_dirs=[numpy.get_include()], +- libraries=libraries, +- extra_compile_args=["-O3"]) ++ libraries=libraries) + + config.add_subpackage("tests") + diff --git a/sci-libs/scikit-learn/scikit-learn-0.24.1.ebuild b/sci-libs/scikit-learn/scikit-learn-0.24.1.ebuild new file mode 100644 index 00000000000..947f22c56d0 --- /dev/null +++ b/sci-libs/scikit-learn/scikit-learn-0.24.1.ebuild @@ -0,0 +1,58 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +DISTUTILS_USE_SETUPTOOLS=no +DISTUTILS_IN_SOURCE_BUILD=1 +inherit distutils-r1 + +DESCRIPTION="Machine learning library for Python" +HOMEPAGE="https://scikit-learn.org/stable/"; +SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~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}] + dev-python/threadpoolctl[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest + +PATCHES=( "${FILESDIR}"/${P}-no-O3.patch ) + +python_test() { + distutils_install_for_testing + # manually run tests as they need some weird thingies + # skip tests which need data files that are not installed + local tfile + for tfile in sklearn/tests/test_*.py ; do + if [[ "${tfile}" =~ "test_multiclass.py" || + "${tfile}" =~ "test_multioutput.py" || + "${tfile}" =~ "test_pipeline.py" ]]; then + continue + fi + elog "Testing: ${tfile}" + ${EPYTHON} "${tfile}" || die "tests failed for ${tfile} with ${EPYTHON}" + done +} + +python_install_all() { + find "${S}" -name \*LICENSE.txt -delete || die + distutils-r1_python_install_all + use examples && dodoc -r examples +}
