diff options
| author |   Sam James <sam@gentoo.org> | 2021-11-05 05:43:30 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-11-05 05:56:48 +0000 |
| commit | d1291d92a0979e9227bbd81d4db6076ea08dddef (patch) | |
| tree | 0f68af839dde41eeda822d79433a6bff7ffb4e36 /dev-python/scipy | |
| parent | dev-python/pydata-sphinx-theme: drop 0.6.3, 0.7.0 (diff) | |
| download | gentoo-d1291d92a0979e9227bbd81d4db6076ea08dddef.tar.gz gentoo-d1291d92a0979e9227bbd81d4db6076ea08dddef.tar.bz2 gentoo-d1291d92a0979e9227bbd81d4db6076ea08dddef.zip | |
dev-python/scipy: add upstream fix for 32-bit test failures (pythran)
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-python/scipy')
| -rw-r--r-- | dev-python/scipy/files/scipy-1.7.1-pythran-tests-32-bit.patch | 31 | ||||
| -rw-r--r-- | dev-python/scipy/scipy-1.7.1-r1.ebuild (renamed from dev-python/scipy/scipy-1.7.1.ebuild) | 4 |
2 files changed, 35 insertions, 0 deletions
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 <serge.guelton@telecom-bretagne.eu> +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.ebuild b/dev-python/scipy/scipy-1.7.1-r1.ebuild index ed5e007e4e2f..0ef732f5b199 100644 --- a/dev-python/scipy/scipy-1.7.1.ebuild +++ b/dev-python/scipy/scipy-1.7.1-r1.ebuild @@ -47,6 +47,10 @@ DISTUTILS_IN_SOURCE_BUILD=1 distutils_enable_tests pytest +PATCHES=( + "${FILESDIR}"/${P}-pythran-tests-32-bit.patch +) + src_unpack() { default if use doc; then |