saymrwulf/pytorch
1
0
Fork 0
mirror of https://github.com/saymrwulf/pytorch.git synced 2026-05-14 20:57:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[JIT] Set future's error to current exception as is when --torch_jit_enable_rethrow_caught_exception=true (#63348)

Browse source 
Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/63348

This change addresses singlaiiit's comment on D30241792 (61b49c8e41), which makes the JIT interpreter's behavior consistent between `future` is set and not.

Test Plan: Enhanced `EnableRethrowCaughtExceptionTest.EnableRethrowCaughtExceptionTestRethrowsCaughtException` to cover the modified code path.

Reviewed By: singlaiiit

Differential Revision: D30347782

fbshipit-source-id: 79ce57283154ca4372e5341217d942398db21ac8
This commit is contained in:
Don Jang 2021-08-16 17:30:26 -07:00 committed by Facebook GitHub Bot
parent 075024b9a3
commit e7724bb100
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
test/cpp/jit/test_interpreter.cpp
View file

@ -265,6 +265,21 @@ graph(%0 : Tensor,
"The size of tensor a (2) must match the size of tensor b (3) at non-singleton dimension 1");
}
EXPECT_TRUE(exception_handled);
FLAGS_torch_jit_enable_rethrow_caught_exception = true;
c10::intrusive_ptr<Future> future = interp.runAsync(stack);
future->wait();
ASSERT_TRUE(future->completed());
ASSERT_TRUE(future->hasError());
try {
std::rethrow_exception(future->exception_ptr());
} catch (c10::Error& e) {
std::string exception_msg = e.what_without_backtrace();
EXPECT_STREQ(
exception_msg.c_str(),
"The size of tensor a (2) must match the size of tensor b (3) at non-singleton dimension 1");
}
FLAGS_torch_jit_enable_rethrow_caught_exception = original_flag_value;
}

3
torch/csrc/jit/runtime/interpreter.cpp
View file

@ -720,7 +720,8 @@ struct InterpreterStateImpl : c10::intrusive_ptr_target {
}
if (FLAGS_torch_jit_enable_rethrow_caught_exception) {
if (future_) {
future_->setError(std::make_exception_ptr(e));
future_->setError(std::current_exception());
return false;
}
throw;
}