Refactor SDFG List to CFG List #1511
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
alexnick83
approved these changes
Jan 29, 2024
tbennun
requested changes
Jan 29, 2024
| @@ -113,7 +113,7 @@ namespace perf { | |||
| * @param cat: Comma separated categories the event belongs to. | |||
| * @param tstart: Start timestamp of the event. | |||
| * @param tend: End timestamp of the event. | |||
| * @param sdfg_id: SDFG ID of the element associated with this event. | |||
| * @param cfg_id: SDFG ID of the element associated with this event. | |||
There was a problem hiding this comment.
Docs need changing (control flow graph id…)
dace/sdfg/sdfg.py
Outdated
| @@ -564,32 +563,31 @@ def sdfg_id(self): | |||
| """ | |||
| Returns the unique index of the current SDFG within the current | |||
| tree of SDFGs (top-level SDFG is 0, nested SDFGs are greater). | |||
| :note: `sdfg_id` is deprecated, please use `cfg_id` instead. | |||
dace/sdfg/sdfg.py
Outdated
| @@ -564,32 +563,31 @@ def sdfg_id(self): | |||
| """ | |||
| Returns the unique index of the current SDFG within the current | |||
| self.state_id = state_id | ||
| self.node_ids = node_ids | ||
|
|
||
| def printer(self): | ||
| print("SDFG {}:{}:{}".format(self.sdfg_id, self.state_id, self.node_ids)) | ||
| print("SDFG {}:{}:{}".format(self.cfg_id, self.state_id, self.node_ids)) |
There was a problem hiding this comment.
This is fine to keep as is
| @@ -183,7 +183,7 @@ def expand(self, sdfg: SDFG, graph: SDFGState, reduce_node): | |||
| LocalStorage.node_a: nsdfg.sdfg.nodes()[0].nodes().index(inner_exit), | |||
| LocalStorage.node_b: nsdfg.sdfg.nodes()[0].nodes().index(outer_exit) | |||
| } | |||
| nsdfg_id = nsdfg.sdfg.sdfg_list.index(nsdfg.sdfg) | |||
There was a problem hiding this comment.
I think this behavior was done on purpose (since the cfg list wasn’t updated yet or something), but it passes the tests so far..
There was a problem hiding this comment.
Reverted for safety
| @@ -215,7 +215,7 @@ def expand(self, sdfg: SDFG, graph: SDFGState, reduce_node): | |||
| LocalStorage.node_b: nsdfg.sdfg.nodes()[0].nodes().index(inner_entry) | |||
| } | |||
|
|
|||
| nsdfg_id = nsdfg.sdfg.sdfg_list.index(nsdfg.sdfg) | |||
| nsdfg_id = nsdfg.sdfg.cfg_id | |||
| @@ -224,7 +224,7 @@ def apply_pattern(self, append: bool = True, annotate: bool = True) -> Union[Any | |||
| """ | |||
| if append: | |||
| self._sdfg.append_transformation(self) | |||
| tsdfg: SDFG = self._sdfg.sdfg_list[self.sdfg_id] | |||
| tsdfg: SDFG = self._sdfg.cfg_list[self.cfg_id] | |||
There was a problem hiding this comment.
How do we know it’s an SDFG? seems like it’s the parent cf block
There was a problem hiding this comment.
My bad, we do not. That is by design, too, but I am mixing PRs here a bit. In a different PR the interface for the transformation does not expect an SDFG anymore but a CFG (same for propagation etc.). However, I have now inserted a compatibility fix in this PR.
| @@ -680,22 +680,22 @@ class SubgraphTransformation(TransformationBase): | |||
| class docstring for more information. | |||
| """ | |||
|
|
|||
| sdfg_id = Property(dtype=int, desc='ID of SDFG to transform') | |||
| cfg_id = Property(dtype=int, desc='ID of SDFG to transform') | |||
|
@phschaad mostly needs a doc update |
tbennun
approved these changes
Jan 29, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to no response for status checks
github-merge-queue
bot
removed this pull request from the merge queue due to a conflict with the base branch
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.
Refactors the SDFG list and SDFG ids to a more general CFG list and CFG id.
This change provides a further step towards compatibility with the hierarchical, multi-level SDFGs.
The change is accompanied by a deprecation warning on the old interfaces (
sdfg_list,sdfg_id,reset_sdfg_list, andupdate_sdfg_list). Until removal, the legacy methods continue to work as expected for single level SDFGs.