diff options
Diffstat (limited to 'dev-python/scipy/files')
3 files changed, 28 insertions, 53 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 deleted file mode 100644 index 206d1d9fa3b2..000000000000 --- a/dev-python/scipy/files/scipy-1.7.1-pythran-tests-32-bit.patch +++ /dev/null @@ -1,31 +0,0 @@ -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/files/scipy-1.8.0-skip-build-revert.patch b/dev-python/scipy/files/scipy-1.8.0-skip-build-revert.patch deleted file mode 100644 index caefc334a973..000000000000 --- a/dev-python/scipy/files/scipy-1.8.0-skip-build-revert.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 2b6392eeeb8ef5225ace15e8a1553fa87409272f Mon Sep 17 00:00:00 2001 -From: Ralf Gommers <ralf.gommers@gmail.com> -Date: Wed, 29 Dec 2021 22:47:13 +0100 -Subject: [PATCH] Revert "BLD Respect the --skip-build flag in setup.py" - ---- - setup.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 002531fcc00..d91916e5894 100755 ---- a/setup.py -+++ b/setup.py -@@ -488,8 +488,6 @@ def setup_package(): - if "--force" in sys.argv: - run_build = True - sys.argv.remove('--force') -- elif "--skip-build" in sys.argv: -- run_build = False - else: - # Raise errors for unsupported commands, improve help output, etc. - run_build = check_setuppy_command() diff --git a/dev-python/scipy/files/scipy-1.9.9999-meson-options-lapack.patch b/dev-python/scipy/files/scipy-1.9.9999-meson-options-lapack.patch new file mode 100644 index 000000000000..23d29c31c2cb --- /dev/null +++ b/dev-python/scipy/files/scipy-1.9.9999-meson-options-lapack.patch @@ -0,0 +1,28 @@ +diff --git a/meson_options.txt b/meson_options.txt +index 5935bb8..f8c14ce 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,6 +1,6 @@ +-option('blas', type: 'string', value: 'openblas', ++option('blas', type: 'string', value: 'blas', + description: 'option for BLAS library switching') +-option('lapack', type: 'string', value: 'openblas', ++option('lapack', type: 'string', value: 'lapack', + description: 'option for LAPACK library switching') + option('use-g77-abi', type: 'boolean', value: 'false', + description: 'If set to true, forces using g77 compatibility wrappers ' + +diff --git a/meson.build b/meson.build +index d80ebc93e..c0c92c00f 100644 +--- a/meson.build ++++ b/meson.build +@@ -16,8 +16,8 @@ project( + 'c_args=-Wno-unused-function -Wno-conversion -Wno-misleading-indentation -Wno-incompatible-pointer-types', + 'fortran_args=-Wno-conversion', + 'fortran_std=legacy', +- 'blas=openblas', +- 'lapack=openblas' ++ 'blas=blas', ++ 'lapack=lapack' + ], + ) + |