Merge branch 'main' into petsc

Author: ZoeLeibowitz

.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

@@ -51,7 +51,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

@@ -38,6 +38,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:
@@ -83,6 +89,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

@@ -24,7 +24,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

@@ -33,7 +33,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

@@ -131,7 +131,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/tutorials.yml

@@ -60,7 +60,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 }}
 
@@ -144,3 +144,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
@@ -294,6 +295,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',

devito/arch/compiler.py

@@ -180,6 +180,7 @@ def __init__(self):
     """
 
     fields = {'cc', 'ld'}
+    linker_opt = '-Wl,'
     _default_cpp = False
     _cxxstd = 'c++14'
     _cstd = 'c99'
@@ -290,6 +291,22 @@ def load(self, soname):
         """
         return npct.load_library(str(self.get_jit_dir().joinpath(soname)), '.')
 
+    def save_header(self, filename, code):
+        """
+        Store some source code into a header file within the same temporary directory
+        used for JIT compilation.
+
+        Parameters
+        ----------
+        filename : str
+            The name of the header file (w/o the suffix).
+        code : str
+            The source code to be stored.
+        """
+        hfile = self.get_jit_dir().joinpath(filename).with_suffix('.h')
+        with open(str(hfile), 'w') as f:
+            f.write(code)
+
     def save(self, soname, binary):
         """
         Store a binary into a file within a temporary directory.
@@ -425,7 +442,7 @@ def add_library_dirs(self, dirs, rpath=False):
         if rpath:
             # Add rpath flag to embed library dir
             for d in as_list(dirs):
-                self.ldflags.append(f'-Wl,-rpath,{d}')
+                self.ldflags.append(f'{self.linker_opt}-rpath,{d}')
 
     def add_libraries(self, libs):
         self.libraries = filter_ordered(self.libraries + as_list(libs))
@@ -662,6 +679,7 @@ def __lookup_cmds__(self):
 class CudaCompiler(Compiler):
 
     _default_cpp = True
+    linker_opt = "--linker-options="
 
     def __init_finalize__(self, **kwargs):