Skip to content

[jit] Include module names in recursive error stacks #22921

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 7 commits into from
Closed

[jit] Include module names in recursive error stacks #22921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8d8a1f0
[jit] Include module names in recursive error stacks
Jul 16, 2019
e591b92
use function's qualified name
Jul 16, 2019
ebf2431
Merge branch 'master' of github.com:pytorch/pytorch into driazati/mor…
Jul 17, 2019
e6b79e8
Fix test, clear stack after successful compilation
Jul 17, 2019
8c43d33
fix test
Jul 18, 2019
12def1f
Merge branch 'master' of github.com:pytorch/pytorch into driazati/mor…
Jul 19, 2019
95f7f65
fix test
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
4 changes: 4 additions & 0 deletions test/test_jit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13265,9 +13265,13 @@ def forward(self, x):
checker = FileCheck()
checker.check("Expected a value of type 'int'")
checker.check("return d(\"hello\")")
checker.check("\'b")
checker.check("return c(x)")
checker.check("Submodule.forward\'")
checker.check("return b(x)")
checker.check("M.some_method\'")
checker.check("return y + self.submodule(y)")
checker.check("M.forward\'")
checker.check("return self.some_method(x)")
checker.run(str(e))

Expand Down
7 changes: 6 additions & 1 deletion torch/csrc/jit/script/compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2972,7 +2972,12 @@ std::unique_ptr<Function> CompilationUnit::define(
auto creator = [def, _resolver, self](Function& method) {
// Store the function name so that it can be referenced if there is an error
// while compiling this function
ErrorReport::CallStack::push_function(def.name().name());
if (self) {
// Include the fully qualified name if this is a method
ErrorReport::CallStack::push_function(method.qualname().qualifiedName());
} else {
ErrorReport::CallStack::push_function(method.qualname().name());
}
to_ir(def, _resolver, self, method);
// Compilation was successful, so remove the function def info
ErrorReport::CallStack::pop_function();
Expand Down