Don't print backtrace for interpreter errors (#20925)

davidriazati · facebook-github-bot · commit 3858e1684bf4 · 2019-05-24T14:58:48.000-07:00
Summary: Eager Python errors don't include a backtrace so script shouldn't either Pull Request resolved: #20925 Pulled By: driazati Differential Revision: D15499952 fbshipit-source-id: 1169f13ba5578cd52948725eda73de8229146bb1
diff --git a/test/test_jit.py b/test/test_jit.py
@@ -12983,6 +12983,16 @@ def split_two(tensor):
         y = torch.randn(3, 6)
         self.checkScript(split_two, [(x + y)])
 
+    def test_conv_error(self):
+        @torch.jit.script
+        def fn(x, y):
+            return F.conv2d(x, y)
+
+        try:
+            fn(torch.ones(2, 2), torch.ones(4, 4))
+        except RuntimeError as e:
+            self.assertFalse('frame' in str(e))
+
     def test_python_op_name(self):
         import random
 
diff --git a/torch/csrc/jit/source_range.h b/torch/csrc/jit/source_range.h
@@ -47,7 +47,14 @@ struct CAFFE2_API SourceRange {
       const std::exception& e,
       const std::string& additional = "") {
     std::stringstream msg;
-    msg << "\n" << e.what() << ":\n";
+    std::string what;
+    auto c10_error = dynamic_cast<const c10::Error*>(&e);
+    if (c10_error) {
+      what = c10_error->msg_without_backtrace();
+    } else {
+      what = e.what();
+    }
+    msg << "\n" << what << ":\n";
     if (!additional.empty()) {
       msg << additional << ":\n";
     }
