Merge remote-tracking branch 'upstream/main' into multi-stage-time-integrator

Author: fernanvr

.github/workflows/asv.yml

@@ -13,10 +13,6 @@ on:
     inputs:
       tags:
         description: 'Run ASV'
-  # Trigger the workflow on push to the main branch
-  push:
-    branches:
-      - main
 
 jobs:
 

.github/workflows/examples-mpi.yml

@@ -49,7 +49,7 @@ jobs:
       uses: actions/checkout@v5
 
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.11
 

.github/workflows/examples.yml

@@ -36,6 +36,12 @@ jobs:
     - name: Checkout devito
       uses: actions/checkout@v5
 
+    - name: Checkout data
+      uses: actions/checkout@v5
+      with:
+       repository: 'devitocodes/data'
+       path: 'data'
+
     - name: Setup conda
       uses: conda-incubator/setup-miniconda@v3
       with:
@@ -81,6 +87,13 @@ jobs:
       run: |
         python examples/cfd/example_diffusion.py
 
+    - name: Timestepping examples
+      run: |
+        python examples/timestepping/ic_superstep.py -d 1
+        python examples/timestepping/ic_superstep.py -d 2
+        python examples/timestepping/acoustic_superstep.py --model layered
+        python examples/timestepping/acoustic_superstep.py --model marmousi
+
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v5
       with:

.github/workflows/flake8.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Set up Python 3.10
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: "3.10"
     - name: Install dependencies

.github/workflows/pytest-core-mpi.yml

@@ -31,7 +31,7 @@ jobs:
       RDMAV_FORK_SAFE: 1
 
     steps:
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
 

.github/workflows/pytest-core-nompi.yml

@@ -129,7 +129,7 @@ jobs:
 
     - name: Set up Python ${{ matrix.python-version }}
       if: "!contains(matrix.name, 'docker')"
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
         allow-prereleases: true

.github/workflows/pythonpublish.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: '3.x'
     - name: Install dependencies

.github/workflows/triggers.yml

@@ -13,14 +13,14 @@ jobs:
     - uses: actions/checkout@v5
 
     - name: Trigger doc build
-      uses: peter-evans/repository-dispatch@v3
+      uses: peter-evans/repository-dispatch@v4
       with:
         token: ${{ secrets.DEPLOY_DOC_PAT }}
         repository: devitocodes/devitoproject.org
         event-type: deploy-docs
 
     - name: Trigger pro submodule update
-      uses: peter-evans/repository-dispatch@v3
+      uses: peter-evans/repository-dispatch@v4
       with:
         token: ${{ secrets.PRO_SUBMODULE }}
         repository: devitocodespro/devitopro

.github/workflows/tutorials.yml

@@ -58,7 +58,7 @@ jobs:
 
     - name: Set up Python ${{ matrix.pyver }}
       if: "!contains(matrix.name, 'docker')"
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.pyver }}
 
@@ -142,3 +142,7 @@ jobs:
     - name: ABC Notebooks
       run: |
         ${{ env.RUN_CMD }} py.test --nbval examples/seismic/abc_methods
+
+    - name: Timestepping Notebooks
+      run: |
+        ${{ env.RUN_CMD }} py.test --nbval examples/timestepping

conftest.py

@@ -4,6 +4,7 @@
 
 import pytest
 from sympy import Add
+from sympy.printing import sstr
 
 from devito import Eq, configuration, Revolver  # noqa
 from devito.checkpointing import NoopRevolver
@@ -287,6 +288,20 @@ def pytest_runtest_makereport(item, call):
             result.outcome = 'passed'
 
 
+def pytest_make_parametrize_id(config, val, argname):
+    """
+    Prevents pytest from making obscure parameter names (param0, param1, ...)
+    and default to sympy.sstr(val) instead for better log readability.
+    """
+    # First see if it has a name
+    if hasattr(val, '__name__'):
+        return val.__name__
+    try:
+        return sstr(val)
+    except Exception:
+        return None  # Fall back to default behavior
+
+
 # A list of optimization options/pipelines to be used in testing
 # regarding spatial and/or temporal blocking.
 opts_tiling = ['advanced',