Skip to content

Commit 77f8725

Browse files
authored
Merge pull request #2584 from devitocodes/JDBetteridge/update_ubuntu_20.04
Update 20.04 runners to 22.04
2 parents 19cfcb6 + f8fabc8 commit 77f8725

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
jobs:
1818
test-mpi-basic:
1919
name: pytest-mpi
20-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-22.04
2121
strategy:
2222
matrix:
2323
python-version: ['3.9', '3.11']
@@ -28,6 +28,7 @@ jobs:
2828
OMP_NUM_THREADS: "1"
2929
CC: "gcc-9"
3030
CXX: "g++-9"
31+
RDMAV_FORK_SAFE: 1
3132

3233
steps:
3334
- uses: actions/setup-python@v5
@@ -76,20 +77,20 @@ jobs:
7677
os: ubuntu-latest
7778
# Need safe math for icx due to inaccuracy with mpi+sinc interpolation
7879
mpiflag: "-e DEVITO_SAFE_MATH=1"
79-
80+
8081
steps:
8182
- name: Checkout devito
8283
uses: actions/checkout@v4
83-
84+
8485
- name: Build docker image
8586
run: |
8687
docker build . --file docker/Dockerfile.devito --tag devito_img --build-arg base=devitocodes/bases:cpu-${{ matrix.arch }}
87-
88+
8889
- name: Test with pytest
8990
run: |
9091
docker run --init -t --rm -e CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }} -e OMP_NUM_THREADS=1 --name testrun devito_img pytest tests/test_mpi.py
9192
9293
- name: Test examples with MPI
9394
run: |
9495
docker run --init -t --rm ${{ matrix.mpiflag }} -e DEVITO_MPI=1 -e OMP_NUM_THREADS=1 --name examplerun devito_img mpiexec -n 2 pytest examples/seismic/acoustic
95-
docker run --init -t --rm -e DEVITO_MPI=1 -e OMP_NUM_THREADS=1 --name examplerun devito_img mpiexec -n 2 pytest examples/seismic/tti
96+
docker run --init -t --rm -e DEVITO_MPI=1 -e OMP_NUM_THREADS=1 --name examplerun devito_img mpiexec -n 2 pytest examples/seismic/tti

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
name: [
3333
pytest-ubuntu-py311-gcc11-noomp,
3434
pytest-ubuntu-py312-gcc12-omp,
35-
pytest-ubuntu-py39-gcc7-omp,
35+
pytest-ubuntu-py39-gcc14-omp,
3636
pytest-ubuntu-py310-gcc10-noomp,
3737
pytest-ubuntu-py312-gcc13-omp,
3838
pytest-ubuntu-py39-gcc9-omp,
@@ -56,16 +56,16 @@ jobs:
5656
language: "openmp"
5757
sympy: "1.13"
5858

59-
- name: pytest-ubuntu-py39-gcc7-omp
59+
- name: pytest-ubuntu-py39-gcc14-omp
6060
python-version: '3.9'
61-
os: ubuntu-20.04
62-
arch: "gcc-7"
61+
os: ubuntu-24.04
62+
arch: "gcc-14"
6363
language: "openmp"
6464
sympy: "1.9"
6565

6666
- name: pytest-ubuntu-py310-gcc10-noomp
6767
python-version: '3.10'
68-
os: ubuntu-20.04
68+
os: ubuntu-22.04
6969
arch: "gcc-10"
7070
language: "C"
7171
sympy: "1.11"
@@ -79,7 +79,7 @@ jobs:
7979

8080
- name: pytest-ubuntu-py39-gcc9-omp
8181
python-version: '3.9'
82-
os: ubuntu-20.04
82+
os: ubuntu-22.04
8383
arch: "custom"
8484
language: "openmp"
8585
sympy: "1.10"
@@ -152,7 +152,7 @@ jobs:
152152
echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH
153153
fi
154154
id: set-tests
155-
155+
156156
- name: Set pip flags for latest python (3.12)
157157
run: |
158158
if [ "${{ matrix.python-version }}" == '3.12' ]; then

0 commit comments

Comments
 (0)