Merge pull request matplotlib#24786 from QuLogic/arm-tolerance

Increase a few test tolerances on some arches

Author: tacaswell

lib/matplotlib/tests/test_axes.py

@@ -1032,7 +1032,9 @@ def test_imshow():
     ax.imshow("r", data=data)
 
 
-@image_comparison(['imshow_clip'], style='mpl20')
+@image_comparison(
+    ['imshow_clip'], style='mpl20',
+    tol=1.24 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
 def test_imshow_clip():
     # As originally reported by Gellule Xg <[email protected]>
     # use former defaults to match existing baseline image
@@ -2352,7 +2354,9 @@ def test_contour_hatching():
                 extend='both', alpha=0.5)
 
 
-@image_comparison(['contour_colorbar'], style='mpl20')
+@image_comparison(
+    ['contour_colorbar'], style='mpl20',
+    tol=0.02 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
 def test_contour_colorbar():
     x, y, z = contour_dat()
 

lib/matplotlib/tests/test_colorbar.py

@@ -1,3 +1,5 @@
+import platform
+
 import numpy as np
 import pytest
 
@@ -233,7 +235,9 @@ def test_colorbar_single_ax_panchor_east(constrained):
     assert ax.get_anchor() == 'E'
 
 
-@image_comparison(['contour_colorbar.png'], remove_text=True)
+@image_comparison(
+    ['contour_colorbar.png'], remove_text=True,
+    tol=0.01 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
 def test_contour_colorbar():
     fig, ax = plt.subplots(figsize=(4, 2))
     data = np.arange(1200).reshape(30, 40) - 500

lib/matplotlib/tests/test_contour.py

@@ -318,8 +318,10 @@ def test_contourf_log_extension():
     cb = plt.colorbar(c3, ax=ax3)
 
 
-@image_comparison(['contour_addlines.png'],
-                  remove_text=True, style='mpl20', tol=0.03)
+@image_comparison(
+    ['contour_addlines.png'], remove_text=True, style='mpl20',
+    tol=0.15 if platform.machine() in ('aarch64', 'ppc64le', 's390x')
+        else 0.03)
 # tolerance is because image changed minutely when tick finding on
 # colorbars was cleaned up...
 def test_contour_addlines():

lib/matplotlib/tests/test_image.py

@@ -1337,8 +1337,9 @@ def test_nonuniform_and_pcolor():
         ax.set(xlim=(0, 10))
 
 
-@image_comparison(["rgba_antialias.png"], style="mpl20",
-                  remove_text=True)
+@image_comparison(
+    ['rgba_antialias.png'], style='mpl20', remove_text=True,
+    tol=0.007 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
 def test_rgba_antialias():
     fig, axs = plt.subplots(2, 2, figsize=(3.5, 3.5), sharex=False,
                             sharey=False, constrained_layout=True)

lib/matplotlib/tests/test_lines.py

@@ -3,6 +3,7 @@
 """
 
 import itertools
+import platform
 import timeit
 from types import SimpleNamespace
 
@@ -178,7 +179,9 @@ def test_set_drawstyle():
     assert len(line.get_path().vertices) == len(x)
 
 
-@image_comparison(['line_collection_dashes'], remove_text=True, style='mpl20')
+@image_comparison(
+    ['line_collection_dashes'], remove_text=True, style='mpl20',
+    tol=0.62 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
 def test_set_line_coll_dash_image():
     fig, ax = plt.subplots()
     np.random.seed(0)

lib/matplotlib/tests/test_mathtext.py

@@ -1,5 +1,6 @@
 import io
 from pathlib import Path
+import platform
 import re
 import shlex
 from xml.etree import ElementTree as ET
@@ -198,7 +199,8 @@ def baseline_images(request, fontset, index, text):
 @pytest.mark.parametrize(
     'fontset', ['cm', 'stix', 'stixsans', 'dejavusans', 'dejavuserif'])
 @pytest.mark.parametrize('baseline_images', ['mathtext'], indirect=True)
-@image_comparison(baseline_images=None)
+@image_comparison(baseline_images=None,
+                  tol=0.011 if platform.machine() in ('ppc64le', 's390x') else 0)
 def test_mathtext_rendering(baseline_images, fontset, index, text):
     mpl.rcParams['mathtext.fontset'] = fontset
     fig = plt.figure(figsize=(5.25, 0.75))
@@ -239,7 +241,8 @@ def test_mathtext_rendering_lightweight(baseline_images, fontset, index, text):
 @pytest.mark.parametrize(
     'fontset', ['cm', 'stix', 'stixsans', 'dejavusans', 'dejavuserif'])
 @pytest.mark.parametrize('baseline_images', ['mathfont'], indirect=True)
-@image_comparison(baseline_images=None, extensions=['png'])
+@image_comparison(baseline_images=None, extensions=['png'],
+                  tol=0.011 if platform.machine() in ('ppc64le', 's390x') else 0)
 def test_mathfont_rendering(baseline_images, fontset, index, text):
     mpl.rcParams['mathtext.fontset'] = fontset
     fig = plt.figure(figsize=(5.25, 0.75))