Skip to content

Commit 1a8af15

Browse files
albanDpytorchmergebot
authored andcommittedJun 27, 2023
Upgrade Pybind submodule to 2.10.4 (pytorch#103989)
This is not ready for review, this is to make sure asan is fixed. Not sure what is the most effective way to track down the bad dec_ref within deploy yet. The asan silencing is done to match this comment: https://github.com/pytorch/pytorch/blob/1c79003b3c13c7bc47e5796e4451d6565121f3a0/test/test_cpp_extensions_jit.py#L749-L752 EDIT: since the final failing function is in libtorch_python.so, we would need to skip that whole lib (not ok). So now we're skipping based on the function name which should be restrictive enough to not hide any real bug. Pull Request resolved: pytorch#103989 Approved by: https://github.com/malfet
1 parent c98896b commit 1a8af15

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed
 

‎.ci/pytorch/test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ fi
140140
# ASAN test is not working
141141
if [[ "$BUILD_ENVIRONMENT" == *asan* ]]; then
142142
export ASAN_OPTIONS=detect_leaks=0:symbolize=1:detect_stack_use_after_return=true:strict_init_order=true:detect_odr_violation=1:detect_container_overflow=0:check_initialization_order=true:debug=true
143-
export UBSAN_OPTIONS=print_stacktrace=1
143+
export UBSAN_OPTIONS=print_stacktrace=1:suppressions=$PWD/ubsan.supp
144144
export PYTORCH_TEST_WITH_ASAN=1
145145
export PYTORCH_TEST_WITH_UBSAN=1
146146
# TODO: Figure out how to avoid hard-coding these paths

‎third_party/pybind11

Submodule pybind11 updated 78 files

‎torch/csrc/distributed/rpc/py_rref.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ PyRRef::PyRRef(const py::object& value, const py::object& type_hint)
141141

142142
PyRRef::~PyRRef() {
143143
if (type_.has_value()) {
144+
pybind11::gil_scoped_acquire ag;
144145
(*type_).dec_ref();
145146
// explicitly setting PyObject* to nullptr to prevent py::object's dtor to
146147
// decref on the PyObject again.

‎ubsan.supp

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
vptr:pybind11::detail::translate_exception

0 commit comments

Comments
 (0)
Please sign in to comment.