Merge pull request #2220 from devitocodes/ci-fix

compiler: Fix reduction over sparse only

.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

.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

devito/ir/clusters/visitors.py

@@ -200,9 +200,9 @@ def __init__(self, func, mode='dense'):
         self.func = func
 
         if mode == 'dense':
-            self.cond = lambda c: c.is_dense
+            self.cond = lambda c: c.is_dense or not c.is_sparse
         elif mode == 'sparse':
-            self.cond = lambda c: not c.is_dense
+            self.cond = lambda c: c.is_sparse
         else:
             self.cond = lambda c: True
 

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)) == \

tests/test_dle.py

@@ -14,7 +14,7 @@
                            retrieve_iteration_tree, Expression)
 from devito.passes.iet.languages.openmp import Ompizer, OmpRegion
 from devito.tools import as_tuple
-from devito.types import Scalar
+from devito.types import Scalar, Symbol
 
 
 def get_blocksizes(op, opt, grid, blockshape, level=0):
@@ -789,6 +789,32 @@ def test_reduction_local(self):
 
         assert n.data[0] == 11*11
 
+    def test_mapify_reduction_sparse(self):
+        grid = Grid((11, 11))
+        s = SparseTimeFunction(name="s", grid=grid, npoint=1, nt=11)
+        s.data.fill(1.)
+        r = Symbol(name="r", dtype=np.float32)
+        n0 = Function(name="n0", dimensions=(Dimension("noi"),), shape=(1,))
+
+        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
+
+        expr1 = FindNodes(Expression).visit(op1)
+        assert len(expr1) == 4
+        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
+
     def test_array_max_reduction(self):
         """
         Test generation of OpenMP sum-reduction clauses involving Function's.