mirror of
https://github.com/pytorch/pytorch.git
synced 2025-10-21 05:34:18 +08:00
eb73650723
This PR is a bit more involved but effectively works to drastically simplify PyObjectSlot and PyInterpreter.
1) For PyObjectSlot we now use a global pyinterpreter since there only is one. From here we change all of the call sites to rely on this assumption.
2) We also remove the "tags" of the PyInterpreter by deprecating `PyInterpreterStatus`.
For the reviewer, sadly it seems like `functorch/csrc/dim/dim.cpp` needed to get linted, so there is an unreadable amount of changes there. Fortunately, the only actual change in the file is as follows which just removes `getPyInterpreter()` from the `check_pyobj` call.
```
mpy::handle handle_from_tensor(Arena& A, TensorRef t) {
- // fast case: tensor is live in python
- std::optional<PyObject*> mb_obj =
- t->unsafeGetTensorImpl()->pyobj_slot()->check_pyobj(getPyInterpreter(), /*ignore_hermetic_tls=*/false);
- if (mb_obj.has_value() && !t->unsafeGetTensorImpl()->pyobj_slot()->owns_pyobj()) {
- return *mb_obj;
- }
- return A.autorelease(mpy::object::checked_steal(THPVariable_Wrap(*t)));
-}
-}
+ // fast case: tensor is live in python
+ std::optional<PyObject*> mb_obj =
+ t->unsafeGetTensorImpl()->pyobj_slot()->check_pyobj(
+ /*ignore_hermetic_tls=*/false);
+ if (mb_obj.has_value() &&
+ !t->unsafeGetTensorImpl()->pyobj_slot()->owns_pyobj()) {
+ return *mb_obj;
+ }
+ return A.autorelease(mpy::object::checked_steal(THPVariable_Wrap(*t)));
+}
```
Pull Request resolved: https://github.com/pytorch/pytorch/pull/158427
Approved by: https://github.com/albanD
21 lines
657 B
C++
21 lines
657 B
C++
#include <torch/csrc/PyInterpreter.h>
|
|
#include <torch/csrc/PyInterpreterHooks.h>
|
|
|
|
namespace torch::detail {
|
|
|
|
PyInterpreterHooks::PyInterpreterHooks(c10::impl::PyInterpreterHooksArgs) {}
|
|
|
|
c10::impl::PyInterpreter* PyInterpreterHooks::getPyInterpreter() const {
|
|
// Delegate to the existing implementation
|
|
return ::getPyInterpreter();
|
|
}
|
|
|
|
} // namespace torch::detail
|
|
|
|
// Sigh, the registry doesn't support namespaces :(
|
|
using c10::impl::PyInterpreterHooksRegistry;
|
|
using c10::impl::RegistererPyInterpreterHooksRegistry;
|
|
using PyInterpreterHooks = torch::detail::PyInterpreterHooks;
|
|
// Register the implementation
|
|
REGISTER_PYTHON_HOOKS(PyInterpreterHooks);
|