Skip to content

Commit 25ffeeb

Browse files
committed
ci: Refactor nompi matrix setup
1 parent 70e7940 commit 25ffeeb

1 file changed

Lines changed: 15 additions & 8 deletions

File tree

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

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616

1717
jobs:
1818
pytest:
19-
name: ${{ matrix.name }}-${{ matrix.set }}
19+
name: ${{ matrix.name }}-${{ matrix.suffix || matrix.set }}
2020
runs-on: "${{ matrix.os }}"
2121

2222
env:
@@ -50,48 +50,56 @@ jobs:
5050
arch: "gcc-11"
5151
language: "CXX"
5252
sympy: "1.14"
53+
test-path: 'tests/'
5354

5455
- name: pytest-ubuntu-py312-gcc12-cxxomp
5556
python-version: '3.12'
5657
os: ubuntu-24.04
5758
arch: "gcc-12"
5859
language: "CXXopenmp"
5960
sympy: "1.13"
61+
test-path: 'tests/'
6062

6163
- name: pytest-ubuntu-py310-gcc14-omp
6264
python-version: '3.10'
6365
os: ubuntu-24.04
6466
arch: "gcc-14"
6567
language: "openmp"
6668
sympy: "1.12"
69+
test-path: 'tests/'
6770

6871
- name: pytest-ubuntu-py311-gcc10-noomp
6972
python-version: '3.11'
7073
os: ubuntu-22.04
7174
arch: "gcc-10"
7275
language: "C"
7376
sympy: "1.14"
77+
test-path: 'tests/'
7478

7579
- name: pytest-ubuntu-py312-gcc13-omp
7680
python-version: '3.12'
7781
os: ubuntu-24.04
7882
arch: "gcc-13"
7983
language: "openmp"
8084
sympy: "1.13"
85+
test-path: 'tests/'
8186

8287
- name: pytest-ubuntu-py310-gcc9-omp
8388
python-version: '3.10'
8489
os: ubuntu-22.04
8590
arch: "custom"
8691
language: "openmp"
8792
sympy: "1.12"
93+
test-path: 'tests/'
8894

8995
- name: pytest-osx-py312-clang-omp
9096
python-version: '3.12'
9197
os: macos-latest
9298
arch: "clang"
9399
language: "openmp"
94100
sympy: "1.12"
101+
set: base
102+
test-path: 'tests/'
95103

96104
- name: pytest-docker-py310-gcc-omp
97105
python-version: '3.10'
@@ -100,6 +108,7 @@ jobs:
100108
arch: "gcc"
101109
language: "openmp"
102110
sympy: "1.13"
111+
test-path: 'tests/'
103112

104113
- name: pytest-docker-py310-icx-omp
105114
python-version: '3.10'
@@ -108,6 +117,7 @@ jobs:
108117
arch: "icx"
109118
language: "openmp"
110119
sympy: "1.13"
120+
test-path: 'tests/'
111121

112122
- name: pytest-docker-py313-gcc-nogil
113123
python-version: '3.13'
@@ -116,31 +126,28 @@ jobs:
116126
arch: "gcc"
117127
language: "C"
118128
sympy: "1.14"
129+
set: base
130+
test-path: 'tests/test_operator.py'
131+
suffix: 'operator'
119132

120133
- name: pytest-ubuntu-py313-gcc14-omp
121134
python-version: '3.13'
122135
os: ubuntu-24.04
123136
arch: "gcc-14"
124137
language: "openmp"
125138
sympy: "1.14"
126-
set: operator
139+
test-path: 'tests/'
127140

128141
- set: base
129142
test-set: 'not adjoint'
130-
test-path: 'tests/'
131143

132144
- set: adjoint
133145
test-set: 'adjoint'
134-
test-path: 'tests/'
135146

136147
- set: operator
137148
test-set: ''
138149
test-path: 'tests/test_operator.py'
139150

140-
exclude:
141-
- name: pytest-osx-py312-clang-omp
142-
set: adjoint
143-
144151
steps:
145152
- name: Checkout devito
146153
uses: actions/checkout@v4

0 commit comments

Comments
 (0)