Fix ambiguous_with breaking run conditions
#9253
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
alice-i-cecile
added
C-Bug
maniwani
approved these changes
Jul 24, 2023
|
Good fix. Can you add a regression test to make sure this doesn't resurface? |
JoJoJet
approved these changes
Aug 2, 2023
|
Example |
The failed example is from a commit I've accidentally pushed with the regression test commit, if anyone wonders. |
JoJoJet
added
the
S-Ready-For-Final-Review
james7132
approved these changes
Aug 3, 2023
cart
pushed a commit
that referenced
this pull request
Aug 10, 2023
# Objective - Fixes #9114 ## Solution Inside `ScheduleGraph::build_schedule()` the variable `node_count = self.systems.len() + self.system_sets.len()` is used to calculate the indices for the `reachable` bitset derived from `self.hierarchy.graph`. However, the number of nodes inside `self.hierarchy.graph` does not always correspond to `self.systems.len() + self.system_sets.len()` when `ambiguous_with` is used, because an ambiguous set is added to `system_sets` (because we need an `NodeId` for the ambiguity graph) without adding a node to `self.hierarchy`. In this PR, we rename `node_count` to the more descriptive name `hg_node_count` and set it to `self.hierarchy.graph.node_count()`. --------- Co-authored-by: James Liu <contact@jamessliu.com>
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.
Objective
ambiguous_withbreaks run conditions #9114Solution
Inside
ScheduleGraph::build_schedule()the variablenode_count = self.systems.len() + self.system_sets.len()is used to calculate the indices for thereachablebitset derived fromself.hierarchy.graph. However, the number of nodes insideself.hierarchy.graphdoes not always correspond toself.systems.len() + self.system_sets.len()whenambiguous_withis used, because an ambiguous set is added tosystem_sets(because we need anNodeIdfor the ambiguity graph) without adding a node toself.hierarchy.In this PR, we rename
node_countto the more descriptive namehg_node_countand set it toself.hierarchy.graph.node_count().