frozenleaves/pytorch
1
0
Fork 0
mirror of https://github.com/pytorch/pytorch.git synced 2025-10-22 14:15:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Deduplicate c10 error and PyTorchError hierarchy (#87855)

Browse Source 
Fixes #53370

Pull Request resolved: https://github.com/pytorch/pytorch/pull/87855
Approved by: https://github.com/albanD
This commit is contained in:
William Phetsinorath
2023-01-02 15:53:36 +00:00
committed by PyTorch MergeBot
parent 2b52db9c95
commit 34f2d3e6ae
28 changed files with 432 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
torch/csrc/jit/python/script_init.cpp
View File

@ -837,7 +837,7 @@ void initJitScriptBindings(PyObject* module) {
try {
return toPyObject(self.attr(name));
} catch (const ObjectAttributeError& err) {
throw AttributeError("%s", err.what());
TORCH_CHECK_ATTRIBUTE(false, err.what());
}
})
.def(
@ -858,7 +858,7 @@ void initJitScriptBindings(PyObject* module) {
}
return toPyObject(self.attr(name));
} catch (const ObjectAttributeError& err) {
throw AttributeError("%s", err.what());
TORCH_CHECK_ATTRIBUTE(false, err.what());
}
})
.def(
@ -888,7 +888,7 @@ void initJitScriptBindings(PyObject* module) {
auto ivalue = toIValue(std::move(value), type);
self.setattr(name, ivalue);
} catch (const ObjectAttributeError& err) {
throw AttributeError("%s", err.what());
TORCH_CHECK_ATTRIBUTE(false, err.what());
}
})
.def(
@ -1011,9 +1011,8 @@ void initJitScriptBindings(PyObject* module) {
mm_name,
[mm_name](const Object& self, py::args args, py::kwargs kwargs) {
auto method = self.find_method(mm_name);
if (!method) {
throw NotImplementedError();
}
TORCH_CHECK_NOT_IMPLEMENTED(
method, "object has no attribute '", mm_name, "'");
return invokeScriptMethodFromPython(
*method,
// NOLINTNEXTLINE(performance-move-const-arg)
@ -1401,8 +1400,8 @@ void initJitScriptBindings(PyObject* module) {
if (fn) {
return StrongFunctionPtr(std::move(self), fn);
} else {
throw AttributeError(
"'CompilationUnit' has no attribute '%s'", name.c_str());
TORCH_CHECK_ATTRIBUTE(
false, "'CompilationUnit' has no attribute '", name, "'");
}
})
.def(