From d1291d92a0979e9227bbd81d4db6076ea08dddef Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 5 Nov 2021 05:43:30 +0000 Subject: dev-python/scipy: add upstream fix for 32-bit test failures (pythran) Signed-off-by: Sam James --- .../files/scipy-1.7.1-pythran-tests-32-bit.patch | 31 ++++ dev-python/scipy/scipy-1.7.1-r1.ebuild | 171 +++++++++++++++++++++ dev-python/scipy/scipy-1.7.1.ebuild | 167 -------------------- 3 files changed, 202 insertions(+), 167 deletions(-) create mode 100644 dev-python/scipy/files/scipy-1.7.1-pythran-tests-32-bit.patch create mode 100644 dev-python/scipy/scipy-1.7.1-r1.ebuild delete mode 100644 dev-python/scipy/scipy-1.7.1.ebuild (limited to 'dev-python/scipy') diff --git a/dev-python/scipy/files/scipy-1.7.1-pythran-tests-32-bit.patch b/dev-python/scipy/files/scipy-1.7.1-pythran-tests-32-bit.patch new file mode 100644 index 000000000000..206d1d9fa3b2 --- /dev/null +++ b/dev-python/scipy/files/scipy-1.7.1-pythran-tests-32-bit.patch @@ -0,0 +1,31 @@ +https://github.com/scipy/scipy/commit/5b3a3b440525aa5038e2cead1f9b4f23a610cd9f + +From: serge-sans-paille +Date: Sun, 18 Jul 2021 11:14:29 +0200 +Subject: [PATCH] Extra pythran annotation for i686 support + +Bug spotted on Fedora, see https://src.fedoraproject.org/rpms/scipy/pull-request/22 + +The `int[::]` annotation is used to accept non-contiguous views. +--- a/scipy/optimize/_group_columns.py ++++ b/scipy/optimize/_group_columns.py +@@ -54,6 +54,8 @@ def group_dense(m, n, A): + + #pythran export group_sparse(int, int, intc[], intc[]) + #pythran export group_sparse(int, int, int[], int[]) ++#pythran export group_sparse(int, int, intc[::], intc[::]) ++#pythran export group_sparse(int, int, int[::], int[::]) + def group_sparse(m, n, indices, indptr): + groups = -np.ones(n, dtype=np.intp) + current_group = 0 +--- a/scipy/signal/_max_len_seq_inner.py ++++ b/scipy/signal/_max_len_seq_inner.py +@@ -4,6 +4,7 @@ + import numpy as np + + #pythran export _max_len_seq_inner(intp[], int8[], int, int, int8[]) ++#pythran export _max_len_seq_inner(int[], int8[], int, int, int8[]) + + # Fast inner loop of max_len_seq. + def _max_len_seq_inner(taps, state, nbits, length, seq): + diff --git a/dev-python/scipy/scipy-1.7.1-r1.ebuild b/dev-python/scipy/scipy-1.7.1-r1.ebuild new file mode 100644 index 000000000000..0ef732f5b199 --- /dev/null +++ b/dev-python/scipy/scipy-1.7.1-r1.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="threads(+)" + +inherit fortran-2 distutils-r1 flag-o-matic toolchain-funcs + +# upstream is slacking forever with doc updates +DOC_PV=1.6.2 +DESCRIPTION="Scientific algorithms library for Python" +HOMEPAGE="https://www.scipy.org/" +SRC_URI=" + mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz + doc? ( + https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip + https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf + )" + +LICENSE="BSD LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="doc pythran sparse" + +DEPEND=" + >=dev-python/numpy-1.16.5[lapack,${PYTHON_USEDEP}] + sci-libs/arpack:0= + virtual/cblas + virtual/lapack + sparse? ( sci-libs/umfpack:0= )" +RDEPEND="${DEPEND} + dev-python/pillow[${PYTHON_USEDEP}]" +BDEPEND=" + dev-lang/swig + >=dev-python/cython-0.29.18[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + virtual/pkgconfig + doc? ( app-arch/unzip ) + pythran? ( dev-python/pythran[${PYTHON_USEDEP}] ) + test? ( + dev-python/nose[${PYTHON_USEDEP}] + )" + +DISTUTILS_IN_SOURCE_BUILD=1 + +distutils_enable_tests pytest + +PATCHES=( + "${FILESDIR}"/${P}-pythran-tests-32-bit.patch +) + +src_unpack() { + default + if use doc; then + unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die + fi +} + +pc_incdir() { + $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ + sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' +} + +pc_libdir() { + $(tc-getPKG_CONFIG) --libs-only-L $@ | \ + sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' +} + +pc_libs() { + $(tc-getPKG_CONFIG) --libs-only-l $@ | \ + sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ + -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ + | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' +} + +python_prepare_all() { + # scipy automatically detects libraries by default + export {FFTW,FFTW3,UMFPACK}=None + use sparse && unset UMFPACK + # the missing symbols are in -lpythonX.Y, but since the version can + # differ, we just introduce the same scaryness as on Linux/ELF + [[ ${CHOST} == *-darwin* ]] \ + && append-ldflags -bundle "-undefined dynamic_lookup" \ + || append-ldflags -shared + [[ -z ${FC} ]] && export FC="$(tc-getFC)" + # hack to force F77 to be FC until bug #278772 is fixed + [[ -z ${F77} ]] && export F77="$(tc-getFC)" + export F90="${FC}" + export SCIPY_FCONFIG="config_fc --noopt --noarch" + append-fflags -fPIC + + local libdir="${EPREFIX}"/usr/$(get_libdir) + cat >> site.cfg <<-EOF || die + [blas] + include_dirs = $(pc_incdir cblas) + library_dirs = $(pc_libdir cblas blas):${libdir} + blas_libs = $(pc_libs cblas blas) + [lapack] + library_dirs = $(pc_libdir lapack):${libdir} + lapack_libs = $(pc_libs lapack) + EOF + cat >> setup.cfg <<-EOF || die + [options] + zip_safe = False + EOF + + # TODO + sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \ + -i scipy/stats/tests/test_continuous_basic.py || die + + # Skip known-failing test. Broken on all versions in Gentoo for years. + # bug #743295 + sed -e 's:test_bisplev_integer_overflow:_&:' \ + -i scipy/interpolate/tests/test_fitpack.py || die + + if has_version ">=sci-libs/lapack-3.10"; then + sed -e 's:test_sort(:_&:' \ + -i scipy/linalg/tests/test_decomp.py || die + sed -e 's:test_solve_discrete_are:_&:' \ + -i scipy/linalg/tests/test_solvers.py || die + fi + + distutils-r1_python_prepare_all +} + +python_configure_all() { + export SCIPY_USE_PYTHRAN=$(usex pythran 1 0) + + # bug 721860 + test-flag-FC -fallow-argument-mismatch && + append-fflags -fallow-argument-mismatch +} + +python_compile() { + # FIXME: parallel python building fails, bug #614464 + export MAKEOPTS=-j1 + + ${EPYTHON} tools/cythonize.py || die + distutils-r1_python_compile \ + ${SCIPY_FCONFIG} +} + +python_test() { + # fails with bdist_egg. should it be fixed in distutils-r1 eclass? + distutils_install_for_testing ${SCIPY_FCONFIG} + cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available" + PYTHONPATH=. "${EPYTHON}" -c " +import scipy, sys +r = scipy.test('fast', verbose=2) +sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + use doc && \ + local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \ + local HTML_DOCS=( "${WORKDIR}"/html/. ) + distutils-r1_python_install_all +} + +python_install() { + distutils-r1_python_install ${SCIPY_FCONFIG} + python_optimize +} + +pkg_postinst() { + elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER" + elog "to your prefered image viewer. Example:" + elog " echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc" +} diff --git a/dev-python/scipy/scipy-1.7.1.ebuild b/dev-python/scipy/scipy-1.7.1.ebuild deleted file mode 100644 index ed5e007e4e2f..000000000000 --- a/dev-python/scipy/scipy-1.7.1.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="threads(+)" - -inherit fortran-2 distutils-r1 flag-o-matic toolchain-funcs - -# upstream is slacking forever with doc updates -DOC_PV=1.6.2 -DESCRIPTION="Scientific algorithms library for Python" -HOMEPAGE="https://www.scipy.org/" -SRC_URI=" - mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - doc? ( - https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip - https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf - )" - -LICENSE="BSD LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" -IUSE="doc pythran sparse" - -DEPEND=" - >=dev-python/numpy-1.16.5[lapack,${PYTHON_USEDEP}] - sci-libs/arpack:0= - virtual/cblas - virtual/lapack - sparse? ( sci-libs/umfpack:0= )" -RDEPEND="${DEPEND} - dev-python/pillow[${PYTHON_USEDEP}]" -BDEPEND=" - dev-lang/swig - >=dev-python/cython-0.29.18[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - virtual/pkgconfig - doc? ( app-arch/unzip ) - pythran? ( dev-python/pythran[${PYTHON_USEDEP}] ) - test? ( - dev-python/nose[${PYTHON_USEDEP}] - )" - -DISTUTILS_IN_SOURCE_BUILD=1 - -distutils_enable_tests pytest - -src_unpack() { - default - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -pc_incdir() { - $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ - sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libdir() { - $(tc-getPKG_CONFIG) --libs-only-L $@ | \ - sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libs() { - $(tc-getPKG_CONFIG) --libs-only-l $@ | \ - sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ - -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ - | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' -} - -python_prepare_all() { - # scipy automatically detects libraries by default - export {FFTW,FFTW3,UMFPACK}=None - use sparse && unset UMFPACK - # the missing symbols are in -lpythonX.Y, but since the version can - # differ, we just introduce the same scaryness as on Linux/ELF - [[ ${CHOST} == *-darwin* ]] \ - && append-ldflags -bundle "-undefined dynamic_lookup" \ - || append-ldflags -shared - [[ -z ${FC} ]] && export FC="$(tc-getFC)" - # hack to force F77 to be FC until bug #278772 is fixed - [[ -z ${F77} ]] && export F77="$(tc-getFC)" - export F90="${FC}" - export SCIPY_FCONFIG="config_fc --noopt --noarch" - append-fflags -fPIC - - local libdir="${EPREFIX}"/usr/$(get_libdir) - cat >> site.cfg <<-EOF || die - [blas] - include_dirs = $(pc_incdir cblas) - library_dirs = $(pc_libdir cblas blas):${libdir} - blas_libs = $(pc_libs cblas blas) - [lapack] - library_dirs = $(pc_libdir lapack):${libdir} - lapack_libs = $(pc_libs lapack) - EOF - cat >> setup.cfg <<-EOF || die - [options] - zip_safe = False - EOF - - # TODO - sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \ - -i scipy/stats/tests/test_continuous_basic.py || die - - # Skip known-failing test. Broken on all versions in Gentoo for years. - # bug #743295 - sed -e 's:test_bisplev_integer_overflow:_&:' \ - -i scipy/interpolate/tests/test_fitpack.py || die - - if has_version ">=sci-libs/lapack-3.10"; then - sed -e 's:test_sort(:_&:' \ - -i scipy/linalg/tests/test_decomp.py || die - sed -e 's:test_solve_discrete_are:_&:' \ - -i scipy/linalg/tests/test_solvers.py || die - fi - - distutils-r1_python_prepare_all -} - -python_configure_all() { - export SCIPY_USE_PYTHRAN=$(usex pythran 1 0) - - # bug 721860 - test-flag-FC -fallow-argument-mismatch && - append-fflags -fallow-argument-mismatch -} - -python_compile() { - # FIXME: parallel python building fails, bug #614464 - export MAKEOPTS=-j1 - - ${EPYTHON} tools/cythonize.py || die - distutils-r1_python_compile \ - ${SCIPY_FCONFIG} -} - -python_test() { - # fails with bdist_egg. should it be fixed in distutils-r1 eclass? - distutils_install_for_testing ${SCIPY_FCONFIG} - cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available" - PYTHONPATH=. "${EPYTHON}" -c " -import scipy, sys -r = scipy.test('fast', verbose=2) -sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - use doc && \ - local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \ - local HTML_DOCS=( "${WORKDIR}"/html/. ) - distutils-r1_python_install_all -} - -python_install() { - distutils-r1_python_install ${SCIPY_FCONFIG} - python_optimize -} - -pkg_postinst() { - elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER" - elog "to your prefered image viewer. Example:" - elog " echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc" -} -- cgit v1.2.3-65-gdbad