diff options
| author | Andreas Enge <andreas@enge.fr> | 2026-03-17 22:37:37 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2026-03-17 22:38:32 +0100 |
| commit | d33c0c2583b09b293526281e42e9c2e6fe87ded8 (patch) | |
| tree | 1119908c21561d90538ef429bb86487063db4c9c | |
| parent | b23fc2272924b9a694f3c7cedb66afb722001778 (diff) | |
gnu: Remove python-accupy.
* gnu/packages/maths.scm (python-accupy): Delete variable.
* gnu/packages/patches/python-accupy-fix-use-of-perfplot.patch,
gnu/packages/patches/python-accupy-use-matplotx.patch: Remove files.
* gnu/local.mk (dist_patch_DATA): Unregister patches.
Change-Id: I3364592d794986674bf5fc55463280f58f8efe8a
| -rw-r--r-- | gnu/local.mk | 2 | ||||
| -rw-r--r-- | gnu/packages/maths.scm | 48 | ||||
| -rw-r--r-- | gnu/packages/patches/python-accupy-fix-use-of-perfplot.patch | 48 | ||||
| -rw-r--r-- | gnu/packages/patches/python-accupy-use-matplotx.patch | 113 |
4 files changed, 0 insertions, 211 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 34b082ea8a3..0a6c3fad005 100644 --- a/gnu/local.mk +++ b/gnu/local.mk | |||
| @@ -2085,8 +2085,6 @@ dist_patch_DATA = \ | |||
| 2085 | %D%/packages/patches/pthreadpool-system-libraries.patch \ | 2085 | %D%/packages/patches/pthreadpool-system-libraries.patch \ |
| 2086 | %D%/packages/patches/python-3.11-fix-tests.patch \ | 2086 | %D%/packages/patches/python-3.11-fix-tests.patch \ |
| 2087 | %D%/packages/patches/python-3.12-fix-tests.patch \ | 2087 | %D%/packages/patches/python-3.12-fix-tests.patch \ |
| 2088 | %D%/packages/patches/python-accupy-use-matplotx.patch \ | ||
| 2089 | %D%/packages/patches/python-accupy-fix-use-of-perfplot.patch \ | ||
| 2090 | %D%/packages/patches/python-anyio-unuse-exceptiongroup-in-test.patch \ | 2088 | %D%/packages/patches/python-anyio-unuse-exceptiongroup-in-test.patch \ |
| 2091 | %D%/packages/patches/python-bed-reader-use-store-samples.patch \ | 2089 | %D%/packages/patches/python-bed-reader-use-store-samples.patch \ |
| 2092 | %D%/packages/patches/python-chai-drop-python2.patch \ | 2090 | %D%/packages/patches/python-chai-drop-python2.patch \ |
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 1c066ec9418..72b383fffad 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm | |||
| @@ -4352,54 +4352,6 @@ primes and prime k-tuplets up to 264.") | |||
| 4352 | (home-page "https://github.com/kimwalisch/primesieve") | 4352 | (home-page "https://github.com/kimwalisch/primesieve") |
| 4353 | (license license:bsd-2))) | 4353 | (license license:bsd-2))) |
| 4354 | 4354 | ||
| 4355 | (define-public python-accupy | ||
| 4356 | (package | ||
| 4357 | (name "python-accupy") | ||
| 4358 | (version "0.3.6") | ||
| 4359 | (source | ||
| 4360 | (origin | ||
| 4361 | (method git-fetch) | ||
| 4362 | (uri (git-reference | ||
| 4363 | (url "https://github.com/diego-hayashi/accupy") | ||
| 4364 | (commit version))) | ||
| 4365 | (file-name (git-file-name name version)) | ||
| 4366 | (sha256 | ||
| 4367 | (base32 "0sxkwpp2xy2jgakhdxr4nh1cspqv8l89kz6s832h05pbpyc0n767")) | ||
| 4368 | (patches (search-patches "python-accupy-use-matplotx.patch" | ||
| 4369 | "python-accupy-fix-use-of-perfplot.patch")))) | ||
| 4370 | (build-system pyproject-build-system) | ||
| 4371 | (arguments | ||
| 4372 | (list | ||
| 4373 | ;; tests: 30 passed, 10 warnings | ||
| 4374 | #:phases | ||
| 4375 | #~(modify-phases %standard-phases | ||
| 4376 | (add-after 'unpack 'set-eigen-include-dir | ||
| 4377 | (lambda _ | ||
| 4378 | (substitute* "setup.py" | ||
| 4379 | (("include_dirs=\\[\"\\/usr\\/include\\/eigen3\\/\"\\]," _) | ||
| 4380 | (string-append "include_dirs=[\"" | ||
| 4381 | #$(file-append (this-package-input "eigen") | ||
| 4382 | "/include/eigen3/") | ||
| 4383 | "\"],")))))))) | ||
| 4384 | (native-inputs | ||
| 4385 | (list pybind11-2 | ||
| 4386 | python-matplotx | ||
| 4387 | python-perfplot | ||
| 4388 | python-pytest | ||
| 4389 | python-setuptools)) | ||
| 4390 | (propagated-inputs | ||
| 4391 | (list eigen | ||
| 4392 | python-mpmath | ||
| 4393 | python-numpy-1 | ||
| 4394 | python-pyfma)) | ||
| 4395 | (home-page "https://github.com/diego-hayashi/accupy") | ||
| 4396 | (synopsis "Accurate calculation of sums and dot products") | ||
| 4397 | (description | ||
| 4398 | "@code{accupy} is a Python library for accurately computing sums | ||
| 4399 | and (dot) products. It implements Kahan summation, Shewchuck's algorithm and | ||
| 4400 | summation in K-fold precision.") | ||
| 4401 | (license license:gpl3+))) | ||
| 4402 | |||
| 4403 | ;; It is unfortunate that we cannot just link with the existing blis package. | 4355 | ;; It is unfortunate that we cannot just link with the existing blis package. |
| 4404 | (define-public python-blis | 4356 | (define-public python-blis |
| 4405 | (package | 4357 | (package |
diff --git a/gnu/packages/patches/python-accupy-fix-use-of-perfplot.patch b/gnu/packages/patches/python-accupy-fix-use-of-perfplot.patch deleted file mode 100644 index 5b874e00561..00000000000 --- a/gnu/packages/patches/python-accupy-fix-use-of-perfplot.patch +++ /dev/null | |||
| @@ -1,48 +0,0 @@ | |||
| 1 | From 567558a4eb9b73ab30f9e469b36091eccf445f80 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Felix Gruber <felgru@posteo.net> | ||
| 3 | Date: Sun, 23 Apr 2023 16:48:59 +0200 | ||
| 4 | Subject: [PATCH] Fix use of perfplot. | ||
| 5 | |||
| 6 | data tuples are unpacked by perfplot before it calls the kernel | ||
| 7 | functions. | ||
| 8 | --- | ||
| 9 | tests/test_dot.py | 16 ++++++++-------- | ||
| 10 | 1 file changed, 8 insertions(+), 8 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/tests/test_dot.py b/tests/test_dot.py | ||
| 13 | index a8160fe..51307ad 100644 | ||
| 14 | --- a/tests/test_dot.py | ||
| 15 | +++ b/tests/test_dot.py | ||
| 16 | @@ -76,10 +76,10 @@ def test_speed_comparison1(n_range=None): | ||
| 17 | perfplot.plot( | ||
| 18 | setup=lambda n: (np.random.rand(n, 100), np.random.rand(100, n)), | ||
| 19 | kernels=[ | ||
| 20 | - lambda xy: np.dot(*xy), | ||
| 21 | - lambda xy: accupy.kdot(*xy, K=2), | ||
| 22 | - lambda xy: accupy.kdot(*xy, K=3), | ||
| 23 | - lambda xy: accupy.fdot(*xy), | ||
| 24 | + lambda x, y: np.dot(x, y), | ||
| 25 | + lambda x, y: accupy.kdot(x, y, K=2), | ||
| 26 | + lambda x, y: accupy.kdot(x, y, K=3), | ||
| 27 | + lambda x, y: accupy.fdot(x, y), | ||
| 28 | ], | ||
| 29 | labels=["np.dot", "accupy.kdot[2]", "accupy.kdot[3]", "accupy.fdot"], | ||
| 30 | n_range=n_range, | ||
| 31 | @@ -96,10 +96,10 @@ def test_speed_comparison2(n_range=None): | ||
| 32 | perfplot.plot( | ||
| 33 | setup=lambda n: (np.random.rand(100, n), np.random.rand(n, 100)), | ||
| 34 | kernels=[ | ||
| 35 | - lambda xy: np.dot(*xy), | ||
| 36 | - lambda xy: accupy.kdot(*xy, K=2), | ||
| 37 | - lambda xy: accupy.kdot(*xy, K=3), | ||
| 38 | - lambda xy: accupy.fdot(*xy), | ||
| 39 | + lambda x, y: np.dot(x, y), | ||
| 40 | + lambda x, y: accupy.kdot(x, y, K=2), | ||
| 41 | + lambda x, y: accupy.kdot(x, y, K=3), | ||
| 42 | + lambda x, y: accupy.fdot(x, y), | ||
| 43 | ], | ||
| 44 | labels=["np.dot", "accupy.kdot[2]", "accupy.kdot[3]", "accupy.fdot"], | ||
| 45 | n_range=n_range, | ||
| 46 | -- | ||
| 47 | 2.39.2 | ||
| 48 | |||
diff --git a/gnu/packages/patches/python-accupy-use-matplotx.patch b/gnu/packages/patches/python-accupy-use-matplotx.patch deleted file mode 100644 index f3dd17da229..00000000000 --- a/gnu/packages/patches/python-accupy-use-matplotx.patch +++ /dev/null | |||
| @@ -1,113 +0,0 @@ | |||
| 1 | From 1da1ed24cfba8a051b6c2f452a67ebfee77ca040 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Felix Gruber <felgru@posteo.net> | ||
| 3 | Date: Sun, 23 Apr 2023 15:42:19 +0200 | ||
| 4 | Subject: [PATCH] Use dufte style from matplotx. | ||
| 5 | |||
| 6 | The stand-alone dufte package has been deprecated in favor of the dufte | ||
| 7 | style that has been integrated into matplotx. | ||
| 8 | --- | ||
| 9 | tests/test_dot.py | 10 +++++----- | ||
| 10 | tests/test_sums.py | 12 ++++++------ | ||
| 11 | tox.ini | 2 +- | ||
| 12 | 3 files changed, 12 insertions(+), 12 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/tests/test_dot.py b/tests/test_dot.py | ||
| 15 | index 0a40a0c..a8160fe 100644 | ||
| 16 | --- a/tests/test_dot.py | ||
| 17 | +++ b/tests/test_dot.py | ||
| 18 | @@ -1,5 +1,5 @@ | ||
| 19 | -import dufte | ||
| 20 | import matplotlib.pyplot as plt | ||
| 21 | +import matplotx | ||
| 22 | import numpy as np | ||
| 23 | import perfplot | ||
| 24 | import pytest | ||
| 25 | @@ -33,7 +33,7 @@ def test_fdot(cond): | ||
| 26 | |||
| 27 | |||
| 28 | def test_accuracy_comparison_illcond(target_cond=None): | ||
| 29 | - plt.style.use(dufte.style) | ||
| 30 | + plt.style.use(matplotx.styles.dufte) | ||
| 31 | |||
| 32 | if target_cond is None: | ||
| 33 | target_cond = [10 ** k for k in range(2)] | ||
| 34 | @@ -61,13 +61,13 @@ def test_accuracy_comparison_illcond(target_cond=None): | ||
| 35 | for label, d in zip(labels, data.T): | ||
| 36 | plt.loglog(condition_numbers, d, label=label) | ||
| 37 | |||
| 38 | - dufte.legend() | ||
| 39 | + matplotx.line_labels() | ||
| 40 | plt.xlabel("condition number") | ||
| 41 | - dufte.ylabel("relative error") | ||
| 42 | + matplotx.ylabel_top("relative error") | ||
| 43 | |||
| 44 | |||
| 45 | def test_speed_comparison1(n_range=None): | ||
| 46 | - plt.style.use(dufte.style) | ||
| 47 | + plt.style.use(matplotx.styles.dufte) | ||
| 48 | |||
| 49 | if n_range is None: | ||
| 50 | n_range = [2 ** k for k in range(2)] | ||
| 51 | diff --git a/tests/test_sums.py b/tests/test_sums.py | ||
| 52 | index 1c0f6b0..8cd9ddb 100644 | ||
| 53 | --- a/tests/test_sums.py | ||
| 54 | +++ b/tests/test_sums.py | ||
| 55 | @@ -1,5 +1,5 @@ | ||
| 56 | -import dufte | ||
| 57 | import matplotlib.pyplot as plt | ||
| 58 | +import matplotx | ||
| 59 | import numpy as np | ||
| 60 | import perfplot | ||
| 61 | import pytest | ||
| 62 | @@ -32,7 +32,7 @@ def test_fsum(cond): | ||
| 63 | |||
| 64 | |||
| 65 | def test_accuracy_comparison_illcond(target_conds=None): | ||
| 66 | - plt.style.use(dufte.style) | ||
| 67 | + plt.style.use(matplotx.styles.dufte) | ||
| 68 | |||
| 69 | if target_conds is None: | ||
| 70 | target_conds = [10 ** k for k in range(1, 2)] | ||
| 71 | @@ -71,14 +71,14 @@ def test_accuracy_comparison_illcond(target_conds=None): | ||
| 72 | for label, color, d in zip(labels, colors, data.T): | ||
| 73 | plt.loglog(condition_numbers, d, label=label, color=color) | ||
| 74 | |||
| 75 | - dufte.legend() | ||
| 76 | + matplotx.line_labels() | ||
| 77 | plt.xlabel("condition number") | ||
| 78 | - dufte.ylabel("relative error") | ||
| 79 | + matplotx.ylabel_top("relative error") | ||
| 80 | # plt.gca().set_aspect(1.3) | ||
| 81 | |||
| 82 | |||
| 83 | def test_speed_comparison1(n_range=None): | ||
| 84 | - plt.style.use(dufte.style) | ||
| 85 | + plt.style.use(matplotx.styles.dufte) | ||
| 86 | |||
| 87 | if n_range is None: | ||
| 88 | n_range = [2 ** k for k in range(2)] | ||
| 89 | @@ -109,7 +109,7 @@ def test_speed_comparison1(n_range=None): | ||
| 90 | |||
| 91 | |||
| 92 | def test_speed_comparison2(n_range=None): | ||
| 93 | - plt.style.use(dufte.style) | ||
| 94 | + plt.style.use(matplotx.styles.dufte) | ||
| 95 | |||
| 96 | if n_range is None: | ||
| 97 | n_range = [2 ** k for k in range(2)] | ||
| 98 | diff --git a/tox.ini b/tox.ini | ||
| 99 | index 79a53ec..524b3bc 100644 | ||
| 100 | --- a/tox.ini | ||
| 101 | +++ b/tox.ini | ||
| 102 | @@ -4,7 +4,7 @@ isolated_build = True | ||
| 103 | |||
| 104 | [testenv] | ||
| 105 | deps = | ||
| 106 | - dufte | ||
| 107 | + matplotx | ||
| 108 | perfplot | ||
| 109 | pytest | ||
| 110 | pytest-cov | ||
| 111 | -- | ||
| 112 | 2.39.2 | ||
| 113 | |||
