Complete Transition to Control Flow Regions #1676
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- StateFusionExtended - ArrayElimination - OptionalArrayInference
tbennun
requested changes
Dec 5, 2024
Co-authored-by: Tal Ben-Nun <[email protected]>
…to users/phschaad/adapt_passes
phschaad
force-pushed
the
users/phschaad/adapt_passes
branch
from
f1cb99f to
3a2b342
Compare
tbennun
requested changes
Dec 11, 2024
dace/frontend/python/interface.py
Outdated
| @@ -69,8 +69,7 @@ def program(f: F, | |||
| not depend on internal variables are constant. | |||
| This will hardcode their return values into the | |||
| resulting program. | |||
| :param use_experimental_cfg_blocks: If True, makes use of experimental CFG blocks susch as loop and conditional | |||
| regions. | |||
| :param use_explicit_cfl: If True, makes use of explicit control flow constructs. | |||
There was a problem hiding this comment.
Suggested change
| :param use_explicit_cfl: If True, makes use of explicit control flow constructs. | |
| :param use_explicit_cf: If True, makes use of explicit control flow constructs. |
| @@ -2578,6 +2583,17 @@ def sdfg(self) -> 'SDFG': | |||
| @make_properties | |||
| class AbstractControlFlowRegion(OrderedDiGraph[ControlFlowBlock, 'dace.sdfg.InterstateEdge'], ControlGraphView, | |||
| ControlFlowBlock, abc.ABC): | |||
| """ | |||
| Abstract superclass to represent all kinds of control flow regions in an SDFG. | |||
There was a problem hiding this comment.
docstrings should use double backticks (``) for inline code in Sphinx.
dace/sdfg/state.py
Outdated
| @@ -2711,6 +2753,12 @@ def inline(self) -> Tuple[bool, Any]: | |||
|
|
|||
| return False, None | |||
|
|
|||
| def new_symbols(self, symbols: dict) -> Dict[str, dtypes.typeclass]: | |||
There was a problem hiding this comment.
Suggested change
| def new_symbols(self, symbols: dict) -> Dict[str, dtypes.typeclass]: | |
| def new_symbols(self, symbols: Dict[str, dtypes.typeclass]) -> Dict[str, dtypes.typeclass]: |
| yield from node.sdfg.all_control_flow_regions(recursive=recursive, load_ext=load_ext, | ||
| parent_first=parent_first) | ||
| elif load_ext: | ||
| node.load_external(block) |
There was a problem hiding this comment.
Must be due to a missed rebase, this is already in main: https://github.com/spcl/dace/blob/main/dace/sdfg/state.py#L2838
dace/sdfg/state.py
Outdated
| @@ -3042,6 +3098,11 @@ def start_block(self, block_id): | |||
|
|
|||
| @make_properties | |||
| class ControlFlowRegion(AbstractControlFlowRegion): | |||
| """ | |||
| A `ControlFlowRegion` represents a control flow graph node that itself contains a control flow graph. | |||
There was a problem hiding this comment.
Suggested change
| A `ControlFlowRegion` represents a control flow graph node that itself contains a control flow graph. | |
| A ``ControlFlowRegion`` represents a control flow graph node that itself contains a control flow graph. |
2 tasks
|
Congrats Phil, that's a push ;) I logged the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR completes the transition to hierarchical control flow regions in DaCe. By nature of the significance in change that is brought through the transition to hierarchical control flow regions, this PR is rather substantial. An exhaustive listing of all adaptations is not feasible, but the most important changes and adaptations are listed below:
ControlFlowRegionPass: This pass works likeStatePassorScopePass, and can be extended to write a pass that applies recursively to each control flow region of an SDFG. An option can be set to either apply bottom-up or top-down.Note: The FV3 integration test fails and will continue to fail with this PR, since GT4Py cartesian, which is used by PyFV3, does not consider experimental blocks in their design. Since DaCe v1.0.0 will be released without this PR in it, my suggestion is to limit the application of the FV3 integration and regression tests to PRs which are made to a specific v1.0.0 maintenance branch, which is used for fixes to v1.0.0.