From ce145902d1a28461f94beab9b952b831b962c720 Mon Sep 17 00:00:00 2001 From: Mathias Louboutin Date: Fri, 29 Sep 2023 08:59:18 -0400 Subject: [PATCH] ci: add configuration check --- .github/workflows/pytest-core-mpi.yml | 2 +- .github/workflows/pytest-core-nompi.yml | 6 +++++- tests/test_buffering.py | 2 +- tests/test_dle.py | 6 +++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pytest-core-mpi.yml b/.github/workflows/pytest-core-mpi.yml index ddb9fd2846..581fc94e9c 100644 --- a/.github/workflows/pytest-core-mpi.yml +++ b/.github/workflows/pytest-core-mpi.yml @@ -66,7 +66,7 @@ jobs: os: ubuntu-latest - name: icx arch: icx - os: ["self-hosted", "docker"] + os: ubuntu-latest steps: - name: Checkout devito diff --git a/.github/workflows/pytest-core-nompi.yml b/.github/workflows/pytest-core-nompi.yml index 5370d47118..1cbf3d510d 100644 --- a/.github/workflows/pytest-core-nompi.yml +++ b/.github/workflows/pytest-core-nompi.yml @@ -100,7 +100,7 @@ jobs: - name: pytest-docker-py39-icx-omp python-version: '3.9' - os: ["self-hosted", "docker"] + os: ubuntu-latest arch: "icx" language: "openmp" sympy: "1.12" @@ -160,6 +160,10 @@ jobs: pip install -e .[tests] pip install sympy==${{matrix.sympy}} + - name: Check configuration + run: | + ${{ env.RUN_CMD }} python3 -c "from devito import configuration; print(''.join(['%s: %s \n' % (k, v) for (k, v) in configuration.items()]))" + - name: Test with pytest run: | ${{ env.RUN_CMD }} ${{ matrix.arch }} --version diff --git a/tests/test_buffering.py b/tests/test_buffering.py index 16f98b4f94..d3c8667025 100644 --- a/tests/test_buffering.py +++ b/tests/test_buffering.py @@ -268,7 +268,7 @@ def test_over_injection(): rec.interpolate(expr=u.forward)) op0 = Operator(eqns, opt='noop') - op1 = Operator(eqns, opt='buffering') + op1 = Operator(eqns, opt=('buffering', {'par-collapse-work': 0})) # Check generated code assert len(retrieve_iteration_tree(op1)) == \ diff --git a/tests/test_dle.py b/tests/test_dle.py index f78ff17585..9dcd6d3d6e 100644 --- a/tests/test_dle.py +++ b/tests/test_dle.py @@ -799,7 +799,7 @@ def test_mapify_reduction_sparse(self): eqns = [Eq(r, 0), Inc(r, s*s), Eq(n0[0], r)] op0 = Operator(eqns) op1 = Operator(eqns, opt=('advanced', {'mapify-reduce': True})) - + expr0 = FindNodes(Expression).visit(op0) assert len(expr0) == 3 assert expr0[1].is_reduction @@ -809,11 +809,11 @@ def test_mapify_reduction_sparse(self): assert expr1[1].expr.lhs.indices == s.indices assert expr1[2].expr.rhs.is_Indexed assert expr1[2].is_reduction - + op0() assert n0.data[0] == 11 op1() - assert n0.data[0] == 11 + assert n0.data[0] == 11 def test_array_max_reduction(self): """