8000 [BugFix] Ensure grads and noned when needed by vmoens · Pull Request #1069 · pytorch/tensordict · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[BugFix] Ensure grads and noned when needed #1069

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

Merged
merged 1 commit into from
Nov 1, 2024
Merged

[BugFix] Ensure grads and noned when needed #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 22 additions & 7 deletions tensordict/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6008,17 +6008,32 @@ def _items_list(
vals = [source.get(key, default) for key in new_keys]
return new_keys, vals

@cache # noqa: B019
def _grad(self):
result = self._fast_apply(
lambda x: x.grad, propagate_lock=True, filter_empty=True
# We can't cache this because zero_grad can be called outside (eg from optimizer) and we want the tensors
# to clear out when that is done.
keys, vals = self._items_list(True, True, is_leaf=_NESTED_TENSORS_AS_LISTS)
grads = [val.grad for val in vals]
items = dict(zip(keys, grads))
return self._fast_apply(
lambda name, val: items[name],
named=True,
nested_keys=True,
propagate_lock=True,
filter_empty=True,
is_leaf=_NESTED_TENSORS_AS_LISTS,
)
return result

@cache # noqa: B019
def _data(self):
result = self._fast_apply(lambda x: x.data, propagate_lock=True)
return result
keys, vals = self._items_list(True, True, is_leaf=_NESTED_TENSORS_AS_LISTS)
data = [val.data for val in vals]
items = dict(zip(keys, data))
return self._fast_apply(
lambda name, val: items.get(name),
named=True,
nested_keys=True,
propagate_lock=True,
is_leaf=_NESTED_TENSORS_AS_LISTS,
)

@abc.abstractmethod
def keys(
Expand Down
11 changes: 11 additions & 0 deletions test/test_tensordict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2863,6 +2863,17 @@ def test_update_nested_dict(self):
assert t["a", "b"].shape == torch.Size([2, 3, 1])
t.update({"a": {"d": [[[1]] * 3] * 2}})

def test_zero_grad_module(self):
x = torch.randn(3, 3)
linear = nn.Linear(3, 4)
y = linear(x)
y.sum().backward()
p = TensorDict.from_module(linear).lock_()
assert not p.grad.is_empty()
linear.zero_grad(set_to_none=True)
assert p.grad is None
assert linear.weight.grad is None


class TestPointwiseOps:
@property
Expand Down
Loading
0