Skip to content

throw instead of segfault with invalid args in pybindings #5726

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

throw instead of segfault with invalid args in pybindings #5726

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
14 changes: 8 additions & 6 deletions extension/pybindings/pybindings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ void setup_output_storage(
const std::vector<Span<uint8_t>>& output_storages) {
if (output_storages.size() != method.outputs_size()) {
THROW_IF_ERROR(
Error(),
Error::InvalidArgument,
"number of output storages %zu does not match number of outputs %zu",
output_storages.size(),
method.outputs_size());
Expand Down Expand Up @@ -249,10 +249,10 @@ class Module final {
const std::vector<EValue>& args,
const std::optional<std::vector<Span<uint8_t>>>& output_storages =
std::nullopt) {
auto& method = methods_[method_name];
auto& method = get_method(method_name);
exec_aten::ArrayRef<EValue> input_evalue_list(args.data(), args.size());

Error set_inputs_status = method->set_inputs(input_evalue_list);
Error set_inputs_status = method.set_inputs(input_evalue_list);
THROW_IF_ERROR(
set_inputs_status,
"method->set_inputs() for method '%s' failed with error 0x%" PRIx32,
Expand All @@ -273,9 +273,9 @@ class Module final {
c10::autograd_dispatch_keyset);
#endif
if (output_storages) {
setup_output_storage(*method, *output_storages);
setup_output_storage(method, *output_storages);
}
Error execute_status = method->execute();
Error execute_status = method.execute();
THROW_IF_ERROR(
execute_status,
"method->execute() failed with error 0x%" PRIx32,
Expand All @@ -302,7 +302,9 @@ class Module final {
Method& get_method(const std::string& method_name) {
if (methods_.count(method_name) == 0) {
THROW_IF_ERROR(
Error(), "no such method in program: %s", method_name.c_str());
Error::InvalidArgument,
"no such method in program: %s",
method_name.c_str());
}
return *methods_[method_name].get();
}
Expand Down
12 changes: 12 additions & 0 deletions extension/pybindings/test/make_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,17 @@ def test_method_meta(tester) -> None:
tester.assertEqual(output_tensor.nbytes(), 16)
tester.assertEqual(str(output_tensor), tensor_info)

def test_bad_name(tester) -> None:
# Create an ExecuTorch program from ModuleAdd.
# pyre-fixme[16]: Callable `make_test` has no attribute `wrapper`.
exported_program, inputs = create_program(ModuleAdd())

# Use pybindings to load and execute the program.
executorch_module = load_fn(exported_program.buffer)
# Invoke the callable on executorch_module instead of calling module.forward.
with tester.assertRaises(RuntimeError):
executorch_module.run_method("not_a_real_method", inputs)

######### RUN TEST CASES #########
test_e2e(tester)
test_multiple_entry(tester)
Expand All @@ -351,5 +362,6 @@ def test_method_meta(tester) -> None:
test_quantized_ops(tester)
test_constant_output_not_memory_planned(tester)
test_method_meta(tester)
test_bad_name(tester)

return wrapper
Loading