api: fix handling of multiple conditions for buffering by mloubout · Pull Request #2850 · devitocodes/devito

mloubout · 2026-02-16T18:55:59Z

No description provided.

codecov · 2026-02-16T19:13:17Z

Codecov Report

❌ Patch coverage is 68.98396% with 116 lines in your changes missing coverage. Please review.
✅ Project coverage is 79.25%. Comparing base (110463b) to head (b9eaa6e).

Files with missing lines	Patch %	Lines
devito/passes/clusters/asynchrony.py	20.33%	47 Missing ⚠️
devito/passes/clusters/buffering.py	69.29%	28 Missing and 11 partials ⚠️
devito/ir/support/guards.py	67.34%	14 Missing and 2 partials ⚠️
tests/test_gpu_common.py	0.00%	5 Missing ⚠️
devito/ir/stree/algorithms.py	20.00%	3 Missing and 1 partial ⚠️
devito/parameters.py	25.00%	2 Missing and 1 partial ⚠️
devito/ir/clusters/algorithms.py	81.81%	1 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2850      +/-   ##
==========================================
- Coverage   83.54%   79.25%   -4.30%     
==========================================
  Files         257      257              
  Lines       53922    54159     +237     
  Branches     4613     4661      +48     
==========================================
- Hits        45050    42923    -2127     
- Misses       8074    10381    +2307     
- Partials      798      855      +57

Flag	Coverage Δ
pytest-gpu-aomp-amdgpuX	`?`
pytest-gpu-gcc-	`78.13% <68.98%> (-0.05%)`	⬇️
pytest-gpu-icx-	`78.05% <68.98%> (-0.05%)`	⬇️
pytest-gpu-nvc-nvidiaX	`?`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

FabioLuporini · 2026-02-20T08:56:53Z

        return CondNe(*self.args, evaluate=False)

+    @property
+    def _as_min(self):


I would drop this and rather have a singledispatch handler for CondEq where necessary

FabioLuporini · 2026-02-20T08:57:31Z

+
+def relational_shift(expr, s):
+    """
+    Infer shift incurred by the expression. Generally only


I could use an example here to quickly visualise what's it trying to do

FabioLuporini · 2026-02-20T08:58:34Z

-            expr = uxreplace(expr, {d: IntDiv(index, d.symbolic_factor)})
+
+        # Merge conditionals when possible. E.g if we have an implicit_dim
+        # and there is a dimension with the same parent, we ca merged


Dimension

"ca merged"

"their conditions"

you could also make the example a bit more practical

FabioLuporini · 2026-02-20T08:59:22Z

+        for d in input_expr.implicit_dims:
+            if d not in conditionals:
+                continue
+            for cd in dict(conditionals):


list(...) is fine

FabioLuporini · 2026-02-20T09:05:57Z

+        # Replace the ConditionalDimensions in `expr`
+        for d, cond in conditionals.items():
+            # Replace dimension with index
+            index = d.index


you can spare this line

FabioLuporini · 2026-02-20T09:07:18Z

        ispace = IterationSpace(intervals, iterators)

-        # Construct the conditionals and replace the ConditionalDimensions in `expr`
+        # Construct the conditionals


I think we should place this whole block of code, which constructs/lowers the conditionals, into its own separate functions, and a docstring with some examples

review-notebook-app · 2026-05-28T17:17:37Z

Check out this pull request on

See visual diffs & provide feedback on Jupyter Notebooks.

Powered by ReviewNB

FabioLuporini · 2026-05-30T13:11:27Z

+            shift = relational_shift(cond, d.parent)
+            expr = uxreplace(expr, {d: IntDiv(index, d.symbolic_factor) + shift})
+
+        # Merge conditionals when possible. E.g if we have an implicit_dim


btw this block imho deserves its own function

FabioLuporini · 2026-05-30T13:12:30Z

            if d is not dim:
                continue
-
+            if d in c0.guards and not c0.guards[d].has(Mod):


searching for Mod is a bit meh, I'd rather add a special guard to ir/support/guards.py and look for that instead (there's quite a few already in there!)

FabioLuporini · 2026-05-30T13:12:51Z

            _actions_from_update_memcpy(c, d, clusters, actions, sregistry)
        elif d.is_Custom and is_integer(c.ispace[d].size):
-            _actions_from_init(c, d, actions)
+            _actions_from_init(c, d, clusters, actions)


leftover, I guess

FabioLuporini · 2026-05-30T13:12:55Z



-def _actions_from_init(c, d, actions):
+def _actions_from_init(c, d, clusters, actions):


leftover, I guess

FabioLuporini · 2026-07-13T07:55:33Z

+        if d not in conditionals:
+            continue
+        for cd in list(conditionals):
+            if cd.parent == d.parent and cd is not d:


nitpicking: cd.parent is d.parent ...

FabioLuporini · 2026-07-13T07:56:42Z

+            continue
+        for cd in list(conditionals):
+            if cd.parent == d.parent and cd is not d:
+                cond = conditionals.pop(d)


nitpicking: you don't need this line here, you may just .pop in the else branch, and avoid the = cond in the if branch

FabioLuporini · 2026-07-13T07:56:57Z

+
+    # Replace the ConditionalDimensions in `expr`
+    for d, cond in conditionals.items():
+        # Replace dimension with index


redundant comment?

FabioLuporini · 2026-07-13T08:01:10Z

+def generate_conditionals(expr, input_expr, ordering):
+    """
+    Generate the conditionals for the given expression,
+    based on the input expression and the ordering of dimensions.


nitpicking, we could take the opportunity to add some Examples to the docstring, or at least refer to ConditionalDimension.__doc__ ?

There is additional docstring to ConditionalDimension.doc

FabioLuporini · 2026-07-13T09:24:38Z

+            g = c0.guards.get(d)
+            # Explicit compute guards need no pipeline; memcpy clusters
+            # still need WithLock for the copy-back sync
+            if g is not None and not wraps_memcpy(c0):


I think a lot of the complexity inherent in this guard and the nested one could be mitigated by simply introducing somehting along the lines of c0.guards.has(d, GuardFactor)

FabioLuporini · 2026-07-13T09:46:44Z

+
+    # Alias deferred entries to an existing f-buffer; create one if none
+    for f, deferred in extras.items():
+        reusable = [mapper[(ff, kk)] for (ff, kk) in mapper if ff == f]


FabioLuporini · 2026-07-13T09:49:24Z

+                    # Add all missing buffering dimensions and reorder to
+                    # avoid duplicates with different ordering
+                    ispaces.add(c.ispace.insert(self.dim, edims).reorder())
+            elif ((self.f in c.scope.reads or self.f in c.scope.writes) and


self.f in c.scope.functions or in fact self.f in c.functions should suffice

FabioLuporini · 2026-07-13T09:50:15Z

-
-            lhs = b.indexify()._subs(v.xd, v.first_idx.b)
-            rhs = f.indexify()._subs(v.dim, v.first_idx.f)
+    for b, vb in descriptors.items():


another potential occurrence of descriptors.flatten

FabioLuporini · 2026-07-13T09:52:17Z

-                    )
-                else:
-                    size = async_degree
+        for k, ck in groupby(clusters, key=lambda c: c.guards):


ultra-uber-nitpicking, typically we use letter g for groups

FabioLuporini · 2026-07-13T09:54:10Z

    return p, offset
+
+
+def _buffer_dim(f, key, ck):


this is potentially a legacy over-complication

is it basically what in PRO refer to as .hdim ?

because imho, if so, we could/should somehow abstract the concept here, and just use f.hdim (or whatever name you wanna give it)

FabioLuporini · 2026-08-05T12:21:01Z

+
+    if not conditionals and not input_expr.implicit_dims:
+        return expr, conditionals
+    # Merge conditionals when possible. E.g., if an implicit_dim shares


FabioLuporini · 2026-08-05T12:22:30Z

        if c.is_halo_touch:
            hs = HaloScheme.union(e.rhs.halo_scheme for e in c.exprs)
-            queue.append(c.rebuild(exprs=[], halo_scheme=hs))
+            # Peel syncs (e.g. a WaitLock) off, they must survive an unbound halo.


this could go one line above, then hs = shifts down here before the queue append...

also some blank lines

mloubout added the API api (symbolics, types, ...) label Feb 16, 2026

FabioLuporini reviewed Feb 20, 2026

View reviewed changes

mloubout force-pushed the multi-cond-again branch 4 times, most recently from ef708e5 to b997156 Compare May 22, 2026 15:13

mloubout force-pushed the multi-cond-again branch 5 times, most recently from 7a1a6aa to c7786ea Compare May 28, 2026 17:17

mloubout force-pushed the multi-cond-again branch 11 times, most recently from f904760 to 0500469 Compare May 29, 2026 16:45

FabioLuporini reviewed May 30, 2026

View reviewed changes

Comment thread examples/userapi/05_conditional_dimension.ipynb

mloubout force-pushed the multi-cond-again branch from 0500469 to 30790f0 Compare May 30, 2026 14:35

mloubout added the no-pro-trigger Skip the devitopro submodule update on merge label Jul 1, 2026

mloubout force-pushed the multi-cond-again branch 6 times, most recently from 89aea51 to 99f0a9e Compare July 3, 2026 07:41

FabioLuporini reviewed Jul 13, 2026

View reviewed changes

mloubout mentioned this pull request Jul 20, 2026

compiler: Revamp fuse-task optoption #2975

Merged

mloubout force-pushed the multi-cond-again branch from 99f0a9e to bebbf4f Compare July 21, 2026 09:42

mloubout force-pushed the multi-cond-again branch 6 times, most recently from ab8cd52 to b1147aa Compare July 30, 2026 22:25

FabioLuporini reviewed Aug 5, 2026

View reviewed changes

mloubout added 7 commits August 11, 2026 09:41

compiler: fix multi-cond async

999450f

compiler: fix multi-cond for multi-layer

66b2292

api: fix interpolate with complex dtype

ea88eee

api: fix buffering with multiple conditions

3e94a95

compiler: fix various corner case of multi buffering

73dbe76

compiler: support mutli-buffering

0cab061

misc: cleanup and add comments

686bfcc

mloubout force-pushed the multi-cond-again branch 3 times, most recently from f0fbc35 to 3ca9d26 Compare August 11, 2026 15:00

compiler: fix buffering corner case such as interp

b9eaa6e

mloubout force-pushed the multi-cond-again branch from 3ca9d26 to b9eaa6e Compare August 11, 2026 15:36



		def _actions_from_init(c, d, actions):
		def _actions_from_init(c, d, clusters, actions):

Uh oh!

Conversation

mloubout commented Feb 16, 2026

Uh oh!

codecov Bot commented Feb 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

review-notebook-app Bot commented May 28, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

codecov Bot commented Feb 16, 2026 •

edited

Loading