[gentoo-commits] repo/gentoo:master commit in: dev-python/scipy/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/scipy/files/

[Andrew Ammerlaan]

commit:     1b1d2302f69d78bb7243af6e9d910d844f1c5fd8
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Dec 11 17:57:28 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 08:39:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b1d2302

dev-python/scipy: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34239
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../scipy-1.11.0-determinant-1x1-matrix.patch      | 69 ----------------------
 dev-python/scipy/files/scipy-1.11.1-cython-3.patch | 45 --------------
 2 files changed, 114 deletions(-)

diff --git a/dev-python/scipy/files/scipy-1.11.0-determinant-1x1-matrix.patch b/dev-python/scipy/files/scipy-1.11.0-determinant-1x1-matrix.patch
deleted file mode 100644
index 248ee5299f2c..000000000000
--- a/dev-python/scipy/files/scipy-1.11.0-determinant-1x1-matrix.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-https://github.com/scipy/scipy/issues/18759
-https://github.com/scipy/scipy/pull/18763
-https://github.com/scipy/scipy/commit/61d892c9faa543ad80bd5e2d0bf69821188487e0
-
-From 61d892c9faa543ad80bd5e2d0bf69821188487e0 Mon Sep 17 00:00:00 2001
-From: Ilhan Polat <ilhanpolat@gmail.com>
-Date: Tue, 27 Jun 2023 12:00:38 +0200
-Subject: [PATCH] MAINT:linalg.det:Return scalars for singleton inputs (#18763)
-
---- a/scipy/linalg/_basic.py
-+++ b/scipy/linalg/_basic.py
-@@ -1001,7 +1001,8 @@ def det(a, overwrite_a=False, check_finite=True):
-     det : (...) float or complex
-         Determinant of `a`. For stacked arrays, a scalar is returned for each
-         (m, m) slice in the last two dimensions of the input. For example, an
--        input of shape (p, q, m, m) will produce a result of shape (p, q).
-+        input of shape (p, q, m, m) will produce a result of shape (p, q). If
-+        all dimensions are 1 a scalar is returned regardless of ndim.
- 
-     Notes
-     -----
-@@ -1066,11 +1067,17 @@ def det(a, overwrite_a=False, check_finite=True):
- 
-     # Scalar case
-     if a1.shape[-2:] == (1, 1):
--        if a1.dtype.char in 'dD':
--            return np.squeeze(a1)
-+        # Either ndarray with spurious singletons or a single element
-+        if max(*a1.shape) > 1:
-+            temp = np.squeeze(a1)
-+            if a1.dtype.char in 'dD':
-+                return temp
-+            else:
-+                return (temp.astype('d') if a1.dtype.char == 'f' else
-+                        temp.astype('D'))
-         else:
--            return (np.squeeze(a1).astype('d') if a1.dtype.char == 'f' else
--                    np.squeeze(a1).astype('D'))
-+            return (np.float64(a1.item()) if a1.dtype.char in 'fd' else
-+                    np.complex128(a1.item()))
- 
-     # Then check overwrite permission
-     if not _datacopied(a1, a):  # "a"  still alive through "a1"
---- a/scipy/linalg/tests/test_basic.py
-+++ b/scipy/linalg/tests/test_basic.py
-@@ -930,6 +930,23 @@ class TestDet:
-     def setup_method(self):
-         self.rng = np.random.default_rng(1680305949878959)
- 
-+    def test_1x1_all_singleton_dims(self):
-+        a = np.array([[1]])
-+        deta = det(a)
-+        assert deta.dtype.char == 'd'
-+        assert np.isscalar(deta)
-+        assert deta == 1.
-+        a = np.array([[[[1]]]], dtype='f')
-+        deta = det(a)
-+        assert deta.dtype.char == 'd'
-+        assert np.isscalar(deta)
-+        assert deta == 1.
-+        a = np.array([[[1 + 3.j]]], dtype=np.complex64)
-+        deta = det(a)
-+        assert deta.dtype.char == 'D'
-+        assert np.isscalar(deta)
-+        assert deta == 1.+3.j
-+
-     def test_1by1_stacked_input_output(self):
-         a = self.rng.random([4, 5, 1, 1], dtype=np.float32)
-         deta = det(a)

diff --git a/dev-python/scipy/files/scipy-1.11.1-cython-3.patch b/dev-python/scipy/files/scipy-1.11.1-cython-3.patch
deleted file mode 100644
index 4b402b5c469d..000000000000
--- a/dev-python/scipy/files/scipy-1.11.1-cython-3.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d0dd5c957876300c33db303042dfa4888b1696f4 Mon Sep 17 00:00:00 2001
-From: Matus Valo <matusvalo@gmail.com>
-Date: Sun, 2 Jul 2023 23:12:51 +0200
-Subject: [PATCH 1/2] Add cython_optimize.pxd to _cython_tree
-
----
- scipy/optimize/meson.build | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/scipy/optimize/meson.build b/scipy/optimize/meson.build
-index 26458b05cd7..7c6097acf55 100644
---- a/scipy/optimize/meson.build
-+++ b/scipy/optimize/meson.build
-@@ -206,6 +206,10 @@ endif
- 
- _dummy_init_optimize = fs.copyfile('__init__.py')
- 
-+_cython_tree = [
-+  fs.copyfile('cython_optimize.pxd'),
-+]
-+
- opt_gen = generator(cython,
-   arguments : cython_args,
-   output : '@BASENAME@.c',
-
-From b8621185fa61d6b3610e2cb62eae3b81434952c9 Mon Sep 17 00:00:00 2001
-From: Matus Valo <matusvalo@gmail.com>
-Date: Sun, 2 Jul 2023 23:28:41 +0200
-Subject: [PATCH 2/2] Use absolute import in cython_optimize.pxd
-
----
- scipy/optimize/cython_optimize.pxd | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scipy/optimize/cython_optimize.pxd b/scipy/optimize/cython_optimize.pxd
-index d5a0bdd758e..d35f8da68b3 100644
---- a/scipy/optimize/cython_optimize.pxd
-+++ b/scipy/optimize/cython_optimize.pxd
-@@ -7,5 +7,5 @@
- # support. Changing it causes an ABI forward-compatibility break
- # (gh-11793), so we currently leave it as is (no further cimport
- # statements should be used in this file).
--from .cython_optimize._zeros cimport (
-+from scipy.optimize.cython_optimize._zeros cimport (
-     brentq, brenth, ridder, bisect, zeros_full_output)