-
Notifications
You must be signed in to change notification settings - Fork 3.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add reverse
support in aggregation_resolver
#5084
Open
lightaime
wants to merge
3
commits into
master
Choose a base branch
from
reverse_aggr_resolver
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,15 @@ def normalize_string(s: str) -> str: | |
return s.lower().replace('-', '').replace('_', '').replace(' ', '') | ||
|
||
|
||
def camel_to_snake(s: str) -> str: | ||
import re | ||
s = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', s) | ||
return re.sub('([a-z0-9])([A-Z])', r'\1_\2', s).lower() | ||
|
||
|
||
# Resolvers ################################################################### | ||
|
||
|
||
def resolver(classes: List[Any], class_dict: Dict[str, Any], | ||
query: Union[Any, str], base_cls: Optional[Any], *args, **kwargs): | ||
|
||
|
@@ -36,10 +45,43 @@ def resolver(classes: List[Any], class_dict: Dict[str, Any], | |
assert callable(cls) | ||
return cls | ||
|
||
choices = set(cls.__name__ for cls in classes) | set(class_dict.keys()) | ||
choices = set(cls.__name__ for cls in classes + list(class_dict.values())) | ||
raise ValueError(f"Could not resolve '{query}' among choices {choices}") | ||
|
||
|
||
# Reverse Resolvers ########################################################### | ||
|
||
|
||
def reverse_resolver(classes: List[Any], class_dict: Dict[Any, str], | ||
query: Union[Any, str], base_cls: Optional[Any]): | ||
|
||
if isinstance(query, str): | ||
return query | ||
|
||
assert callable(query) | ||
query_cls_repr = camel_to_snake(query.__class__.__name__) | ||
|
||
if not base_cls: | ||
return query_cls_repr | ||
|
||
base_cls_repr = camel_to_snake(base_cls.__name__) | ||
|
||
if not isinstance(query, base_cls): | ||
choices = {base_cls_repr} | set( | ||
camel_to_snake(cls.__name__).replace(base_cls_repr, '').strip('_') | ||
for cls in classes) | set(class_dict.values()) | ||
choices.remove('') | ||
raise ValueError( | ||
f"Could not resolve '{query}' among choices {choices}") | ||
|
||
for cls, repr in class_dict.items(): | ||
if isinstance(query, cls): | ||
return repr | ||
|
||
repr = query_cls_repr.replace(base_cls_repr, '').strip("_") | ||
return repr if repr else base_cls_repr | ||
|
||
|
||
# Activation Resolver ######################################################### | ||
|
||
|
||
|
@@ -80,14 +122,21 @@ def normalization_resolver(query: Union[Any, str], *args, **kwargs): | |
# Aggregation Resolver ######################################################## | ||
|
||
|
||
def aggregation_resolver(query: Union[Any, str], *args, **kwargs): | ||
def aggregation_resolver(query: Union[Any, str], *args, reverse: bool = False, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not certain I like having a 'reverse' flag because it makes the logic for 'query' a bit complicated. What do you think about splitting this into |
||
**kwargs): | ||
import torch_geometric.nn.aggr as aggr | ||
base_cls = aggr.Aggregation | ||
aggrs = [ | ||
aggr for aggr in vars(aggr).values() | ||
if isinstance(aggr, type) and issubclass(aggr, base_cls) | ||
] | ||
aggr_dict = { | ||
'add': aggr.SumAggregation, | ||
} | ||
return resolver(aggrs, aggr_dict, query, base_cls, *args, **kwargs) | ||
if not reverse: | ||
aggr_dict = { | ||
'add': aggr.SumAggregation, | ||
} | ||
return resolver(aggrs, aggr_dict, query, base_cls, *args, **kwargs) | ||
else: | ||
aggr_dict = { | ||
aggr.Set2Set: 'set2set', | ||
} | ||
return reverse_resolver(aggrs, aggr_dict, query, base_cls) |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe we should have a test case covering this? the logic is not trivial