Merge pull request #22136 from meeseeksmachine/auto-backport-of-pr-22132-on-v3.5.x

QuLogic · web-flow · commit e6bf1bf3561b · 2022-01-07T00:23:26.000-05:00
Backport PR #22132 on branch v3.5.x (TST: Increase fp tolerances for some images)
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -9,7 +9,6 @@ on:
 
 env:
   NO_AT_BRIDGE: 1  # Necessary for GTK3 interactive test.
-  NPY_DISABLE_CPU_FEATURES: "AVX512F,AVX512CD,AVX512VL,AVX512BW,AVX512DQ,AVX512_SKX"
   OPENBLAS_NUM_THREADS: 1
   PYTHONFAULTHANDLER: 1
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -126,7 +126,6 @@ stages:
         displayName: 'print env'
 
       - bash: |
-          export NPY_DISABLE_CPU_FEATURES="AVX512F,AVX512CD,AVX512VL,AVX512BW,AVX512DQ,AVX512_SKX"
           PYTHONFAULTHANDLER=1 python -m pytest --junitxml=junit/test-results.xml -raR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n 2 ||
             [[ "$PYTHON_VERSION" = 'Pre' ]]
         displayName: 'pytest'
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -3326,7 +3326,9 @@ def test_tick_space_size_0():
 
 @image_comparison(['errorbar_basic', 'errorbar_mixed', 'errorbar_basic'])
 def test_errorbar():
-    x = np.arange(0.1, 4, 0.5)
+    # longdouble due to floating point rounding issues with certain
+    # computer chipsets
+    x = np.arange(0.1, 4, 0.5, dtype=np.longdouble)
     y = np.exp(-x)
 
     yerr = 0.1 + 0.2*np.sqrt(x)
diff --git a/lib/matplotlib/tests/test_backend_tk.py b/lib/matplotlib/tests/test_backend_tk.py
@@ -36,8 +36,7 @@ def test_func():
         try:
             proc = subprocess.run(
                 [sys.executable, "-c", f"{source}\n{func.__name__}()"],
-                env={**os.environ, "MPLBACKEND": "TkAgg",
-                     "NPY_DISABLE_CPU_FEATURES": ""},
+                env={**os.environ, "MPLBACKEND": "TkAgg"},
                 timeout=_test_timeout,
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py
@@ -28,8 +28,7 @@ def test_tinypages(tmpdir):
     # coverage anyways); hide them using GCOV_ERROR_FILE.
     proc = Popen(
         cmd, stdout=PIPE, stderr=PIPE, universal_newlines=True,
-        env={**os.environ, "MPLBACKEND": "", "GCOV_ERROR_FILE": os.devnull,
-             "NPY_DISABLE_CPU_FEATURES": ""})
+        env={**os.environ, "MPLBACKEND": "", "GCOV_ERROR_FILE": os.devnull})
     out, err = proc.communicate()
 
     # Build the pages with warnings turned into errors
@@ -129,8 +128,7 @@ def build_sphinx_html(source_dir, doctree_dir, html_dir, extra_args=None):
     cmd = [sys.executable, '-msphinx', '-W', '-b', 'html',
            '-d', str(doctree_dir), str(source_dir), str(html_dir), *extra_args]
     proc = Popen(cmd, stdout=PIPE, stderr=PIPE, universal_newlines=True,
-                 env={**os.environ, "MPLBACKEND": "",
-                      "NPY_DISABLE_CPU_FEATURES": ""})
+                 env={**os.environ, "MPLBACKEND": ""})
     out, err = proc.communicate()
 
     assert proc.returncode == 0, \
diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
@@ -78,7 +78,7 @@ def test_maxlength():
 
 
 @image_comparison(['streamplot_direction.png'],
-                  remove_text=True, style='mpl20', tol=0.056)
+                  remove_text=True, style='mpl20', tol=0.073)
 def test_direction():
     x, y, U, V = swirl_velocity_field()
     plt.streamplot(x, y, U, V, integration_direction='backward',
diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
@@ -140,7 +140,7 @@ def test_polar_box():
     ax1.grid(True)
 
 
-@image_comparison(['axis_direction.png'], style='default', tol=0.07)
+@image_comparison(['axis_direction.png'], style='default', tol=0.071)
 def test_axis_direction():
     # Remove this line when this test image is regenerated.
     plt.rcParams['text.kerning_factor'] = 6
diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
@@ -1,6 +1,5 @@
 import functools
 import itertools
-import platform
 
 import pytest
 
@@ -547,7 +546,7 @@ def test_text3d_modification(fig_ref, fig_test):
         ax_ref.text(x, y, z, f'({x}, {y}, {z}), dir={zdir}', zdir=zdir)
 
 
-@mpl3d_image_comparison(['trisurf3d.png'], tol=0.03)
+@mpl3d_image_comparison(['trisurf3d.png'], tol=0.061)
 def test_trisurf3d():
     n_angles = 36
     n_radii = 8
@@ -1367,7 +1366,7 @@ def test_errorbar3d():
 
 
 @image_comparison(['stem3d.png'], style='mpl20',
-                  tol=0.0 if platform.machine() == 'x86_64' else 0.003)
+                  tol=0.003)
 def test_stem3d():
     fig, axs = plt.subplots(2, 3, figsize=(8, 6),
                             constrained_layout=True,
