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

Revert "Change SymIntNode into an intrusive pointer (#82432)"

Browse Source 
This reverts commit 7be44f8158a817c64de7e2732eba42fc060209f4.

Reverted https://github.com/pytorch/pytorch/pull/82432 on behalf of https://github.com/ezyang due to segfaults on test but not caught in CI
This commit is contained in:
PyTorch MergeBot
2022-07-29 20:08:58 +00:00
parent ff5399e528
commit 3b9cbb1738
10 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
torch/csrc/jit/python/init.cpp
View File

@ -145,7 +145,7 @@ class PythonSymIntNodeImpl : public c10::SymIntNodeImpl {
virtual SymIntNode wrap(int64_t num) override {
py::gil_scoped_acquire acquire;
auto r = getPyObj().attr("wrap")(num);
return c10::make_intrusive<PythonSymIntNodeImpl>(r);
return std::make_shared<PythonSymIntNodeImpl>(r);
}
virtual bool bool_() override {
@ -166,11 +166,11 @@ class PythonSymIntNodeImpl : public c10::SymIntNodeImpl {
virtual SymIntNode dispatch_common_(
const char* fname,
const SymIntNode& other) {
auto* pother = dynamic_cast<PythonSymIntNodeImpl*>(other.get());
auto pother = std::dynamic_pointer_cast<PythonSymIntNodeImpl>(other);
TORCH_CHECK(pother);
py::gil_scoped_acquire acquire;
auto r = getPyObj().attr(fname)(pother->getPyObj());
return c10::make_intrusive<PythonSymIntNodeImpl>(r);
return std::make_shared<PythonSymIntNodeImpl>(r);
}
virtual SymIntNode add(const SymIntNode& other) override {
@ -1182,12 +1182,12 @@ void initJITBindings(PyObject* module) {
.def_static(
"new_symint",
[](py::object obj) -> c10::SymIntNode {
return c10::make_intrusive<PythonSymIntNodeImpl>(obj);
return std::make_shared<PythonSymIntNodeImpl>(obj);
})
.def(
"get_pyobj",
[](c10::SymIntNode a) -> py::object {
if (auto* psn = dynamic_cast<PythonSymIntNodeImpl*>(a.get())) {
if (auto psn = std::dynamic_pointer_cast<PythonSymIntNodeImpl>(a)) {
return py::reinterpret_borrow<py::object>(psn->getPyObj());
}
return py::none();