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.

Sign up for GitHub

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

Fix dimension in edge filter selection #4629

Merged
merged 5 commits into from
May 12, 2022
Merged

Fix dimension in edge filter selection #4629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b46c30
fix dimension in edge filter
Padarn May 12, 2022
a4e8b93
update changelog
Padarn May 12, 2022
ea6cb84
Update CHANGELOG.md
rusty1s May 12, 2022
052c690
update
rusty1s May 12, 2022
201a053
Merge branch 'master' into padarn/cat-dim
rusty1s May 12, 2022
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- Removed unnecessary colons and fixed typos in the documentation ([#4616](https://github.com/pyg-team/pytorch_geometric/pull/4616))
- The `bias` argument in `TAGConv` is now actually applied ([#4597](https://github.com/pyg-team/pytorch_geometric/pull/4597))
- Fixed subclass behaviour of `process` and `download` in `Datsaet` ([#4586](https://github.com/pyg-team/pytorch_geometric/pull/4586))
- Fixed filtering of attributes for loaders in case `__cat_dim__ != 0` ([#4629](https://github.com/pyg-team/pytorch_geometric/pull/4629))
### Removed
10 changes: 6 additions & 4 deletions torch_geometric/loader/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def index_select(value: Tensor, index: Tensor, dim: int = 0) -> Tensor:
numel = math.prod(size)
storage = value.storage()._new_shared(numel)
out = value.new(storage).view(size)
return torch.index_select(value, 0, index, out=out)
return torch.index_select(value, dim, index, out=out)


def edge_type_to_str(edge_type: Union[EdgeType, str]) -> str:
Expand Down Expand Up @@ -101,7 +101,8 @@ def filter_node_store_(store: NodeStorage, out_store: NodeStorage,

elif store.is_node_attr(key):
index = index.to(value.device)
out_store[key] = index_select(value, index, dim=0)
dim = store._parent().__cat_dim__(key, value, store)
out_store[key] = index_select(value, index, dim=dim)

return store

Expand Down Expand Up @@ -132,13 +133,14 @@ def filter_edge_store_(store: EdgeStorage, out_store: EdgeStorage, row: Tensor,
is_sorted=False, trust_data=True)

elif store.is_edge_attr(key):
dim = store._parent().__cat_dim__(key, value, store)
if perm is None:
index = index.to(value.device)
out_store[key] = index_select(value, index, dim=0)
out_store[key] = index_select(value, index, dim=dim)
else:
perm = perm.to(value.device)
index = index.to(value.device)
out_store[key] = index_select(value, perm[index], dim=0)
out_store[key] = index_select(value, perm[index], dim=dim)

return store

Expand Down