Skip to content

[jit] Resolve with closed over variables instead of stack frame #22270

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
driazati wants to merge 2 commits into from
Closed

[jit] Resolve with closed over variables instead of stack frame #22270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc5be3e
update
Jul 18, 2019
5382637
Fix flake
Jul 19, 2019
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
3 changes: 3 additions & 0 deletions test/test_jit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12865,6 +12865,9 @@ def forward(self, x):
self.assertEqual(m.int64_max, imported.int64_max)
self.assertEqual(m.int64_min, imported.int64_min)

def test_script_scope(self):
scripted = torch.jit.script(torch.nn.functional.pad)

@unittest.skipIf(IS_WINDOWS, "NYI: TemporaryFileName on Windows")
def test_serialization_sharing(self):
class M(torch.jit.ScriptModule):
Expand Down
16 changes: 14 additions & 2 deletions torch/jit/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1086,8 +1086,6 @@ def _compile_and_register_class(obj, rcb, qualified_name):
def script(obj, optimize=True, _frames_up=0, _rcb=None):
if not _enabled:
return obj
if _rcb is None:
_rcb = _jit_internal.createResolutionCallback(_frames_up + 1)

if isinstance(obj, torch.nn.Module):
return _convert_to_script_module(obj)
Expand All @@ -1096,10 +1094,24 @@ def script(obj, optimize=True, _frames_up=0, _rcb=None):
if inspect.isclass(obj):
if not _is_new_style_class(obj):
raise RuntimeError("TorchScript classes must be new-style classes. Please inherit from 'object'")
if _rcb is None:
_rcb = _jit_internal.createResolutionCallback(_frames_up + 1)
_compile_and_register_class(obj, _rcb, qualified_name)
return obj
else:
ast = get_jit_def(obj)
if _rcb is None:
closure_rcb = _jit_internal.createResolutionCallbackFromClosure(obj)
stack_rcb = _jit_internal.createResolutionCallback(_frames_up + 1)

def _rcb(name):
# since type comments aren't captured in the function's closures,
# we still need to try to the rcb based on stack frames if the
# closure rcb fails
result = closure_rcb(name)
if result:
return result
return stack_rcb(name)
fn = torch._C._jit_script_compile(qualified_name, ast, _rcb, get_default_args(obj))
# Forward docstrings
fn.__doc__ = obj.__doc__
Expand Down