Skip to content
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 normalization_resolver to resolve normalization layers #4926

Merged
merged 6 commits into from
Jul 7, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

## [2.0.5] - 2022-MM-DD
### Added
- Added support for `normalization_resolver` ([#4926](https://github.com/pyg-team/pytorch_geometric/pull/4926))
- Added support for `follow_batch` for lists or dictionaries of tensors ([#4837](https://github.com/pyg-team/pytorch_geometric/pull/4837))
- Added `Data.validate()` and `HeteroData.validate()` functionality ([#4885](https://github.com/pyg-team/pytorch_geometric/pull/4885))
- Added `LinkNeighborLoader` support to `LightningDataModule` ([#4868](https://github.com/pyg-team/pytorch_geometric/pull/4868))
Expand Down
26 changes: 26 additions & 0 deletions test/nn/test_resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from torch_geometric.nn.resolver import (
activation_resolver,
aggregation_resolver,
normalization_resolver,
)


Expand Down Expand Up @@ -34,3 +35,28 @@ def test_aggregation_resolver(aggr_tuple):
aggr_module, aggr_repr = aggr_tuple
assert isinstance(aggregation_resolver(aggr_module()), aggr_module)
assert isinstance(aggregation_resolver(aggr_repr), aggr_module)


@pytest.mark.parametrize('norm_tuple', [
(torch_geometric.nn.norm.BatchNorm, 'batchnorm'),
rusty1s marked this conversation as resolved.
Show resolved Hide resolved
(torch_geometric.nn.norm.InstanceNorm, 'instancenorm'),
(torch_geometric.nn.norm.LayerNorm, 'layernorm'),
(torch_geometric.nn.norm.GraphNorm, 'graphnorm'),
(torch_geometric.nn.norm.GraphSizeNorm, 'graphsizenorm'),
(torch_geometric.nn.norm.PairNorm, 'pairnorm'),
(torch_geometric.nn.norm.MessageNorm, 'messagenorm'),
(torch_geometric.nn.norm.DiffGroupNorm, 'diffgroupnorm'),
])
def test_normalization_resolver(norm_tuple):
norm_module, norm_repr = norm_tuple
if norm_repr in {'graphsizenorm', 'pairnorm', 'messagenorm'}:
assert isinstance(normalization_resolver(norm_module()), norm_module)
lightaime marked this conversation as resolved.
Show resolved Hide resolved
assert isinstance(normalization_resolver(norm_repr), norm_module)
elif norm_repr == 'diffgroupnorm':
assert isinstance(normalization_resolver(norm_module(16, 4)),
norm_module)
assert isinstance(normalization_resolver(norm_repr, 16, 4),
norm_module)
else:
assert isinstance(normalization_resolver(norm_module(16)), norm_module)
assert isinstance(normalization_resolver(norm_repr, 16), norm_module)
16 changes: 16 additions & 0 deletions torch_geometric/nn/resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,22 @@ def activation_resolver(query: Union[Any, str] = 'relu', *args, **kwargs):
return resolver(acts, act_dict, query, base_cls, *args, **kwargs)


# Normalization Resolver ######################################################


def normalization_resolver(query: Union[Any, str], *args, **kwargs):
import torch

import torch_geometric.nn.norm as norm
base_cls = torch.nn.Module
norms = [
norm for norm in vars(norm).values()
if isinstance(norm, type) and issubclass(norm, base_cls)
]
norm_dict = {}
return resolver(norms, norm_dict, query, base_cls, *args, **kwargs)


# Aggregation Resolver ########################################################


Expand Down