be73e08ba2
* gnu/packages/maths.scm (python-accupy): New variable. * gnu/packages/patches/python-accupy-fix-use-of-perfplot.patch: New file. * gnu/packages/patches/python-accupy-use-matplotx.patch: New file. * gnu/local.mk (dist_patch_DATA): Add new patch files. Change-Id: I0222665d54a36830844b3b33e3dcb546741cfaa1 Signed-off-by: Ludovic Courtès <ludo@gnu.org>
114 lines
3.1 KiB
Diff
114 lines
3.1 KiB
Diff
From 1da1ed24cfba8a051b6c2f452a67ebfee77ca040 Mon Sep 17 00:00:00 2001
|
|
From: Felix Gruber <felgru@posteo.net>
|
|
Date: Sun, 23 Apr 2023 15:42:19 +0200
|
|
Subject: [PATCH] Use dufte style from matplotx.
|
|
|
|
The stand-alone dufte package has been deprecated in favor of the dufte
|
|
style that has been integrated into matplotx.
|
|
---
|
|
tests/test_dot.py | 10 +++++-----
|
|
tests/test_sums.py | 12 ++++++------
|
|
tox.ini | 2 +-
|
|
3 files changed, 12 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/tests/test_dot.py b/tests/test_dot.py
|
|
index 0a40a0c..a8160fe 100644
|
|
--- a/tests/test_dot.py
|
|
+++ b/tests/test_dot.py
|
|
@@ -1,5 +1,5 @@
|
|
-import dufte
|
|
import matplotlib.pyplot as plt
|
|
+import matplotx
|
|
import numpy as np
|
|
import perfplot
|
|
import pytest
|
|
@@ -33,7 +33,7 @@ def test_fdot(cond):
|
|
|
|
|
|
def test_accuracy_comparison_illcond(target_cond=None):
|
|
- plt.style.use(dufte.style)
|
|
+ plt.style.use(matplotx.styles.dufte)
|
|
|
|
if target_cond is None:
|
|
target_cond = [10 ** k for k in range(2)]
|
|
@@ -61,13 +61,13 @@ def test_accuracy_comparison_illcond(target_cond=None):
|
|
for label, d in zip(labels, data.T):
|
|
plt.loglog(condition_numbers, d, label=label)
|
|
|
|
- dufte.legend()
|
|
+ matplotx.line_labels()
|
|
plt.xlabel("condition number")
|
|
- dufte.ylabel("relative error")
|
|
+ matplotx.ylabel_top("relative error")
|
|
|
|
|
|
def test_speed_comparison1(n_range=None):
|
|
- plt.style.use(dufte.style)
|
|
+ plt.style.use(matplotx.styles.dufte)
|
|
|
|
if n_range is None:
|
|
n_range = [2 ** k for k in range(2)]
|
|
diff --git a/tests/test_sums.py b/tests/test_sums.py
|
|
index 1c0f6b0..8cd9ddb 100644
|
|
--- a/tests/test_sums.py
|
|
+++ b/tests/test_sums.py
|
|
@@ -1,5 +1,5 @@
|
|
-import dufte
|
|
import matplotlib.pyplot as plt
|
|
+import matplotx
|
|
import numpy as np
|
|
import perfplot
|
|
import pytest
|
|
@@ -32,7 +32,7 @@ def test_fsum(cond):
|
|
|
|
|
|
def test_accuracy_comparison_illcond(target_conds=None):
|
|
- plt.style.use(dufte.style)
|
|
+ plt.style.use(matplotx.styles.dufte)
|
|
|
|
if target_conds is None:
|
|
target_conds = [10 ** k for k in range(1, 2)]
|
|
@@ -71,14 +71,14 @@ def test_accuracy_comparison_illcond(target_conds=None):
|
|
for label, color, d in zip(labels, colors, data.T):
|
|
plt.loglog(condition_numbers, d, label=label, color=color)
|
|
|
|
- dufte.legend()
|
|
+ matplotx.line_labels()
|
|
plt.xlabel("condition number")
|
|
- dufte.ylabel("relative error")
|
|
+ matplotx.ylabel_top("relative error")
|
|
# plt.gca().set_aspect(1.3)
|
|
|
|
|
|
def test_speed_comparison1(n_range=None):
|
|
- plt.style.use(dufte.style)
|
|
+ plt.style.use(matplotx.styles.dufte)
|
|
|
|
if n_range is None:
|
|
n_range = [2 ** k for k in range(2)]
|
|
@@ -109,7 +109,7 @@ def test_speed_comparison1(n_range=None):
|
|
|
|
|
|
def test_speed_comparison2(n_range=None):
|
|
- plt.style.use(dufte.style)
|
|
+ plt.style.use(matplotx.styles.dufte)
|
|
|
|
if n_range is None:
|
|
n_range = [2 ** k for k in range(2)]
|
|
diff --git a/tox.ini b/tox.ini
|
|
index 79a53ec..524b3bc 100644
|
|
--- a/tox.ini
|
|
+++ b/tox.ini
|
|
@@ -4,7 +4,7 @@ isolated_build = True
|
|
|
|
[testenv]
|
|
deps =
|
|
- dufte
|
|
+ matplotx
|
|
perfplot
|
|
pytest
|
|
pytest-cov
|
|
--
|
|
2.39.2
|
|
|