Skip to content

Commit ccba437

Browse files
connorjwardconnorjward
authored
Fold PyOP2/TSFC workflow into Firedrake one (#4135)
1 parent 4b82203 commit ccba437

11 files changed

Lines changed: 164 additions & 290 deletions

‎.github/workflows/build.yml‎

Lines changed: 42 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
FIREDRAKE_CI: 1
4040
PYOP2_CI_TESTS: 1
4141
PYOP2_SPMD_STRICT: 1
42-
EXTRA_PYTEST_ARGS: --splitting-algorithm least_duration --timeout=600 --timeout-method=thread -o faulthandler_timeout=660 firedrake-repo/tests/firedrake
42+
EXTRA_PYTEST_ARGS: --splitting-algorithm least_duration --timeout=600 --timeout-method=thread -o faulthandler_timeout=660
4343
PYTEST_MPI_MAX_NPROCS: 8
4444
steps:
4545
- name: Fix HOME
@@ -98,63 +98,85 @@ jobs:
9898
firedrake-check
9999
timeout-minutes: 5
100100

101-
- name: Run tests (nprocs = 1)
101+
- name: Run TSFC tests
102102
# Run even if earlier tests failed
103-
if: ${{ success() || steps.install.conclusion == 'success' }}
103+
if: success() || steps.install.conclusion == 'success'
104104
run: |
105105
. venv/bin/activate
106106
: # Use pytest-xdist here so we can have a single collated output (not possible
107107
: # for parallel tests)
108-
firedrake-run-split-tests 1 1 "-n 8 $EXTRA_PYTEST_ARGS"
108+
firedrake-run-split-tests 1 1 -n 8 "$EXTRA_PYTEST_ARGS" firedrake-repo/tests/tsfc
109+
timeout-minutes: 60
110+
111+
- name: Run PyOP2 tests
112+
if: success() || steps.install.conclusion == 'success'
113+
run: |
114+
. venv/bin/activate
115+
: # Use pytest-xdist here so we can have a single collated output (not possible
116+
: # for parallel tests)
117+
firedrake-run-split-tests 1 1 -n 8 "$EXTRA_PYTEST_ARGS" firedrake-repo/tests/pyop2
118+
firedrake-run-split-tests 2 4 "$EXTRA_PYTEST_ARGS" firedrake-repo/tests/pyop2
119+
firedrake-run-split-tests 3 2 "$EXTRA_PYTEST_ARGS" firedrake-repo/tests/pyop2
120+
firedrake-run-split-tests 4 2 "$EXTRA_PYTEST_ARGS" firedrake-repo/tests/pyop2
121+
timeout-minutes: 15
122+
123+
124+
- name: Run Firedrake tests (nprocs = 1)
125+
if: success() || steps.install.conclusion == 'success'
126+
run: |
127+
. venv/bin/activate
128+
: # Use pytest-xdist here so we can have a single collated output (not possible
129+
: # for parallel tests)
130+
firedrake-run-split-tests 1 1 -n 8 "$EXTRA_PYTEST_ARGS" firedrake-repo/tests/firedrake
109131
timeout-minutes: 60
110132

111133
- name: Run tests (nprocs = 2)
112-
if: ${{ success() || steps.install.conclusion == 'success' }}
134+
if: success() || steps.install.conclusion == 'success'
113135
run: |
114136
. venv/bin/activate
115-
firedrake-run-split-tests 2 4 "$EXTRA_PYTEST_ARGS"
137+
firedrake-run-split-tests 2 4 "$EXTRA_PYTEST_ARGS" firedrake-repo/tests/firedrake
116138
timeout-minutes: 30
117139

118140
- name: Run tests (nprocs = 3)
119-
if: ${{ success() || steps.install.conclusion == 'success' }}
141+
if: success() || steps.install.conclusion == 'success'
120142
run: |
121143
. venv/bin/activate
122-
firedrake-run-split-tests 3 2 "$EXTRA_PYTEST_ARGS"
144+
firedrake-run-split-tests 3 2 "$EXTRA_PYTEST_ARGS" firedrake-repo/tests/firedrake
123145
timeout-minutes: 60
124146

125147
- name: Run tests (nprocs = 4)
126-
if: ${{ success() || steps.install.conclusion == 'success' }}
148+
if: success() || steps.install.conclusion == 'success'
127149
run: |
128150
. venv/bin/activate
129-
firedrake-run-split-tests 4 2 "$EXTRA_PYTEST_ARGS"
151+
firedrake-run-split-tests 4 2 "$EXTRA_PYTEST_ARGS" firedrake-repo/tests/firedrake
130152
timeout-minutes: 15
131153

132154
- name: Run tests (nprocs = 5)
133-
if: ${{ success() || steps.install.conclusion == 'success' }}
155+
if: success() || steps.install.conclusion == 'success'
134156
run: |
135157
. venv/bin/activate
136-
firedrake-run-split-tests 5 1 "$EXTRA_PYTEST_ARGS"
158+
firedrake-run-split-tests 5 1 "$EXTRA_PYTEST_ARGS" firedrake-repo/tests/firedrake
137159
timeout-minutes: 15
138160

139161
- name: Run tests (nprocs = 6)
140-
if: ${{ success() || steps.install.conclusion == 'success' }}
162+
if: success() || steps.install.conclusion == 'success'
141163
run: |
142164
. venv/bin/activate
143-
firedrake-run-split-tests 6 1 "$EXTRA_PYTEST_ARGS"
165+
firedrake-run-split-tests 6 1 "$EXTRA_PYTEST_ARGS" firedrake-repo/tests/firedrake
144166
timeout-minutes: 15
145167

146168
- name: Run tests (nprocs = 7)
147-
if: ${{ success() || steps.install.conclusion == 'success' }}
169+
if: success() || steps.install.conclusion == 'success'
148170
run: |
149171
. venv/bin/activate
150-
firedrake-run-split-tests 7 1 "$EXTRA_PYTEST_ARGS"
172+
firedrake-run-split-tests 7 1 "$EXTRA_PYTEST_ARGS" firedrake-repo/tests/firedrake
151173
timeout-minutes: 15
152174

153175
- name: Run tests (nprocs = 8)
154-
if: ${{ success() || steps.install.conclusion == 'success' }}
176+
if: success() || steps.install.conclusion == 'success'
155177
run: |
156178
. venv/bin/activate
157-
firedrake-run-split-tests 8 1 "$EXTRA_PYTEST_ARGS"
179+
firedrake-run-split-tests 8 1 "$EXTRA_PYTEST_ARGS" firedrake-repo/tests/firedrake
158180
timeout-minutes: 15
159181

160182
- name: Run Gusto smoke tests
@@ -260,7 +282,7 @@ jobs:
260282
- name: Setup Python
261283
uses: actions/setup-python@v5
262284
with:
263-
python-version: '3.12'
285+
python-version: "3.12"
264286
- name: Install deps
265287
run: pip install requests packaging
266288
- name: Zenodo API canary
@@ -269,5 +291,5 @@ jobs:
269291
uses: actions/upload-artifact@v4
270292
if: failure()
271293
with:
272-
name: "zenodo-canary"
294+
name: zenodo-canary
273295
path: firedrake-install.log

‎.github/workflows/pyop2.yml‎

Lines changed: 0 additions & 92 deletions
This file was deleted.

‎tests/pyop2/test_api.py‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
from numpy.testing import assert_equal
4141

4242
from pyop2 import exceptions, op2
43+
from pyop2.datatypes import ScalarType
4344
from pyop2.mpi import COMM_WORLD
4445

4546

@@ -684,7 +685,7 @@ def test_dat_initialise_data(self, dset):
684685
"""Dat initilialised without the data should initialise data with the
685686
correct size and type."""
686687
d = op2.Dat(dset)
687-
assert d.data.size == dset.size * dset.cdim and d.data.dtype == np.float64
688+
assert d.data.size == dset.size * dset.cdim and d.data.dtype == ScalarType
688689

689690
def test_dat_initialise_data_type(self, dset):
690691
"""Dat intiialised without the data but with specified type should
@@ -738,12 +739,12 @@ def test_dat_split(self, dat):
738739
def test_dat_dtype(self, dset):
739740
"Default data type should be numpy.float64."
740741
d = op2.Dat(dset)
741-
assert d.dtype == np.double
742+
assert d.dtype == ScalarType
742743

743744
def test_dat_float(self, dset):
744745
"Data type for float data should be numpy.float64."
745746
d = op2.Dat(dset, [1.0] * dset.size * dset.cdim)
746-
assert d.dtype == np.double
747+
assert d.dtype == np.float64
747748

748749
def test_dat_int(self, dset):
749750
"Data type for int data should be numpy.int."
@@ -753,7 +754,7 @@ def test_dat_int(self, dset):
753754
def test_dat_convert_int_float(self, dset):
754755
"Explicit float type should override NumPy's default choice of int."
755756
d = op2.Dat(dset, [1] * dset.size * dset.cdim, np.double)
756-
assert d.dtype == np.float64
757+
assert d.dtype == np.double
757758

758759
def test_dat_convert_float_int(self, dset):
759760
"Explicit int type should override NumPy's default choice of float."
@@ -1151,18 +1152,18 @@ def test_mat_illegal_name(self, sparsity):
11511152
op2.Mat(sparsity, name=2)
11521153

11531154
def test_mat_dtype(self, mat):
1154-
"Default data type should be numpy.float64."
1155-
assert mat.dtype == np.double
1155+
"Default data type should be ScalarType."
1156+
assert mat.dtype == ScalarType
11561157

11571158
def test_mat_properties(self, sparsity):
11581159
"Mat constructor should correctly set attributes."
1159-
m = op2.Mat(sparsity, 'double', 'bar')
1160+
m = op2.Mat(sparsity, ScalarType, 'bar')
11601161
assert m.sparsity == sparsity and \
1161-
m.dtype == np.float64 and m.name == 'bar'
1162+
m.dtype == ScalarType and m.name == 'bar'
11621163

11631164
def test_mat_mixed(self, mmat):
1164-
"Default data type should be numpy.float64."
1165-
assert mmat.dtype == np.double
1165+
"Default data type should be ScalarType."
1166+
assert mmat.dtype == ScalarType
11661167

11671168
def test_mat_illegal_maps(self, mat):
11681169
"Mat arg constructor should reject invalid maps."
@@ -1597,15 +1598,15 @@ def test_empty_map_and_iterset(self):
15971598
s2 = op2.Set(10)
15981599
m = op2.Map(s1, s2, 3)
15991600
d = op2.Dat(s2 ** 1, [0] * 10, dtype=int)
1600-
k = op2.Kernel("static void k(int *x) {}", "k")
1601+
k = op2.Kernel("static void k(int64_t *x) {}", "k")
16011602
op2.par_loop(k, s1, d(op2.READ, m))
16021603

16031604
def test_frozen_dats_cannot_use_different_access_mode(self):
16041605
s1 = op2.Set(2)
16051606
s2 = op2.Set(3)
16061607
m = op2.Map(s1, s2, 3, [0]*6)
16071608
d = op2.Dat(s2**1, [0]*3, dtype=int)
1608-
k = op2.Kernel("static void k(int *x) {}", "k")
1609+
k = op2.Kernel("static void k(int64_t *x) {}", "k")
16091610

16101611
with d.frozen_halo(op2.INC):
16111612
op2.par_loop(k, s1, d(op2.INC, m))

‎tests/pyop2/test_callables.py‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import numpy as np
3838
from pyop2 import op2
3939
from pyop2.configuration import target
40+
from pyop2.datatypes import ScalarType
4041

4142

4243
@pytest.fixture
@@ -46,28 +47,28 @@ def s():
4647

4748
@pytest.fixture
4849
def zero_mat(s):
49-
return op2.Dat(s ** (2, 2), [[0.0, 0.0], [0.0, 0.0]])
50+
return op2.Dat(s ** (2, 2), [[0.0, 0.0], [0.0, 0.0]], dtype=ScalarType)
5051

5152

5253
@pytest.fixture
5354
def inv_mat(s):
54-
return op2.Dat(s ** (2, 2), [[1.0, 2.0], [3.0, 4.0]])
55+
return op2.Dat(s ** (2, 2), [[1.0, 2.0], [3.0, 4.0]], dtype=ScalarType)
5556

5657

5758
@pytest.fixture
5859
def zero_vec(s):
59-
return op2.Dat(s ** (2, 1), [0.0, 0.0])
60+
return op2.Dat(s ** (2, 1), [0.0, 0.0], dtype=ScalarType)
6061

6162

6263
@pytest.fixture
6364
def solve_mat(s):
64-
d = op2.Dat(s ** (2, 2), [[2.0, 1.0], [-3.0, 2.0]])
65+
d = op2.Dat(s ** (2, 2), [[2.0, 1.0], [-3.0, 2.0]], dtype=ScalarType)
6566
return d
6667

6768

6869
@pytest.fixture
6970
def solve_vec(s):
70-
return op2.Dat(s ** (2, 1), [1.0, 0.0])
71+
return op2.Dat(s ** (2, 1), [1.0, 0.0], dtype=ScalarType)
7172

7273

7374
class TestCallables:
@@ -80,8 +81,8 @@ def test_inverse_callable(self, zero_mat, inv_mat):
8081
"""
8182
B[:,:] = inverse(A[:,:])
8283
""",
83-
[loopy.GlobalArg('B', dtype=np.float64, shape=(2, 2)),
84-
loopy.GlobalArg('A', dtype=np.float64, shape=(2, 2))],
84+
[loopy.GlobalArg('B', dtype=ScalarType, shape=(2, 2)),
85+
loopy.GlobalArg('A', dtype=ScalarType, shape=(2, 2))],
8586
target=target,
8687
name="callable_kernel",
8788
lang_version=(2018, 2))
@@ -104,9 +105,9 @@ def test_solve_callable(self, zero_vec, solve_mat, solve_vec):
104105
"""
105106
x[:] = solve(A[:,:], b[:])
106107
""",
107-
[loopy.GlobalArg('x', dtype=np.float64, shape=(2, )),
108-
loopy.GlobalArg('A', dtype=np.float64, shape=(2, 2)),
109-
loopy.GlobalArg('b', dtype=np.float64, shape=(2, ),)],
108+
[loopy.GlobalArg('x', dtype=ScalarType, shape=(2, )),
109+
loopy.GlobalArg('A', dtype=ScalarType, shape=(2, 2)),
110+
loopy.GlobalArg('b', dtype=ScalarType, shape=(2, ),)],
110111
target=target,
111112
name="callable_kernel2",
112113
lang_version=(2018, 2))

0 commit comments

Comments
 (0)