Skip to content

[export] Fix wrap_with_set_grad_enabled retracing #163295

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

Closed
wants to merge 1 commit into from
Closed

[export] Fix wrap_with_set_grad_enabled retracing #163295

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
17 changes: 5 additions & 12 deletions test/export/test_export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13091,6 +13091,8 @@ def _test(m, non_persistent_buffer):
_test(MyModule(), "foo")
_test(MyOuterModule(), "inner.foo")

@testing.expectedFailureTrainingIRToRunDecomp # set_grad disappears after decomp
@testing.expectedFailureTrainingIRToRunDecompNonStrict # set_grad disappears after decomp
def test_export_with_set_grad_enabled(self):
class Model(torch.nn.Module):
def __init__(self) -> None:
Expand All @@ -13103,18 +13105,9 @@ def forward(self, x):

model = Model()
ep = export(model, (torch.randn(4, 4),), {})
# _export_for_traininig is using pre_dispatch=False
# Therefore the set_grad calls are not replaced with a hop.
if not is_training_ir_test(self._testMethodName):
self.assertIn(
"torch.ops.higher_order.wrap_with_set_grad_enabled",
ep.graph_module.code,
)
gm = torch.export.export(model, (torch.randn(4, 4),)).module()
self.assertIn(
"set_grad_enabled",
gm.code,
)
FileCheck().check_count(
"torch.ops.higher_order.wrap_with_set_grad_enabled", 1, exactly=True
).run(ep.graph_module.code)

def test_export_with_autocast(self):
class Model(torch.nn.Module):
Expand Down
7 changes: 5 additions & 2 deletions torch/_higher_order_ops/wrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,11 @@ def __call__(self, enable_grad, wrapped_func, *args, **kwargs):

@disable
def wrapper():
with torch.set_grad_enabled(enable_grad):
return wrapped_func(*args, **kwargs)
prev = torch.is_grad_enabled()
torch.set_grad_enabled(enable_grad)
res = wrapped_func(*args, **kwargs)
torch.set_grad_enabled(prev)
return res

return wrapper()

Expand Down
Loading