From 63521269dde4f5c482d701e7d12aa356614d6c79 Mon Sep 17 00:00:00 2001 From: mloubout Date: Thu, 20 Jun 2024 15:40:46 -0400 Subject: [PATCH] CI: tweak docstring test to avoid repr issues on some system --- devito/__init__.py | 10 ++++++++++ devito/arch/compiler.py | 2 ++ 2 files changed, 12 insertions(+) diff --git a/devito/__init__.py b/devito/__init__.py index 214a0ee8f24..5aeb46837fb 100644 --- a/devito/__init__.py +++ b/devito/__init__.py @@ -1,7 +1,10 @@ import atexit from itertools import product +import os from . import _version +import numpy as np + # Import the global `configuration` dict from devito.parameters import * # noqa @@ -160,6 +163,13 @@ def mode_performance(): configuration['opt-options']['blockinner'] = True +if "PYTEST_VERSION" in os.environ: + # Avoid change in repr break docstring tests + # Only sets it here for testing + # https://numpy.org/devdocs/release/2.0.0-notes.html#representation-of-numpy-scalars-changed # noqa + np.set_printoptions(legacy="1.25") + + # Ensure the SymPy caches are purged at exit # For whatever reason, if we don't do this the garbage collector won't its # job properly and thus we may end up missing some custom __del__'s diff --git a/devito/arch/compiler.py b/devito/arch/compiler.py index c85ec156f2c..9cd94ed597d 100644 --- a/devito/arch/compiler.py +++ b/devito/arch/compiler.py @@ -81,6 +81,8 @@ def sniff_compiler_version(cc, allow_fail=False): ver = '.'.join(ver.strip().split('.')[:3]) if not ver: return Version("0") + # Sanitize bad icx formatting + ver = ver.replace("+git", "").replace("git", "") ver = Version(ver) except UnicodeDecodeError: pass