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

Use class setter properties if present #4682

Merged
merged 5 commits into from
May 19, 2022
Merged
Show file tree
Hide file tree
Changes from all 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 @@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- Added support for graph-level outputs in `to_hetero` ([#4582](https://github.com/pyg-team/pytorch_geometric/pull/4582))
- Added `CHANGELOG.md` ([#4581](https://github.com/pyg-team/pytorch_geometric/pull/4581))
### Changed
- Allow for `setter` properties in `Data` and `HeteroData` ([#4682](https://github.com/pyg-team/pytorch_geometric/pull/4682))
- Allow for optional `edge_weight` in `GCN2Conv` ([#4670](https://github.com/pyg-team/pytorch_geometric/pull/4670))
- Fixed the interplay between `TUDataset` and `pre_transform` that modify node features ([#4669](https://github.com/pyg-team/pytorch_geometric/pull/4669))
- Make use of the `pyg_sphinx_theme` documentation template ([#4664](https://github.com/pyg-team/pyg-lib/pull/4664), [#4667](https://github.com/pyg-team/pyg-lib/pull/4667))
Expand Down
26 changes: 26 additions & 0 deletions test/data/test_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,3 +213,29 @@ def test_data_share_memory():
for data in data_list:
assert data.x.is_shared()
assert torch.allclose(data.x, torch.full((8, ), 4.))


def test_data_setter_properties():
class MyData(Data):
def __init__(self):
super().__init__()
self.my_attr1 = 1
self.my_attr2 = 2

@property
def my_attr1(self):
return self._my_attr1

@my_attr1.setter
def my_attr1(self, value):
self._my_attr1 = value

data = MyData()
assert data.my_attr2 == 2

assert 'my_attr1' not in data._store
assert data.my_attr1 == 1

data.my_attr1 = 2
assert 'my_attr1' not in data._store
assert data.my_attr1 == 2
6 changes: 5 additions & 1 deletion torch_geometric/data/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,11 @@ def __getattr__(self, key: str) -> Any:
return getattr(self._store, key)

def __setattr__(self, key: str, value: Any):
setattr(self._store, key, value)
propobj = getattr(self.__class__, key, None)
if propobj is None or propobj.fset is None:
setattr(self._store, key, value)
else:
propobj.fset(self, value)

def __delattr__(self, key: str):
delattr(self._store, key)
Expand Down