Skip to content

Commit

Permalink
[pybind11] fix deprecated T(handle, bool) (PaddlePaddle#65270)
Browse files Browse the repository at this point in the history
  • Loading branch information
@gouzil
gouzil authored Jun 20, 2024
1 parent 5d634e4 commit d3bd91f
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 23 deletions.
8 changes: 5 additions & 3 deletions paddle/fluid/pybind/eager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,11 +376,13 @@ py::object ParsePyArray(
py::object numpy_value = py::object();

if (kw_order_map["value"] <= args_num) {
numpy_value = py::object(
py::handle(PyTuple_GET_ITEM(args, kw_order_map["value"] - 1)), true);
numpy_value = py::reinterpret_borrow<py::object>(
py::handle(PyTuple_GET_ITEM(args, kw_order_map["value"] - 1)));
} else {
if (flag_kwargs && kws_map["value"] != nullptr) {
numpy_value = py::object(py::handle(kws_map["value"]), true);
numpy_value =
py::reinterpret_borrow<py::object>(py::handle(kws_map["value"]));

} else {
PADDLE_THROW(platform::errors::InvalidArgument(
"The first expected arguments is {value: PyArray}, "
Expand Down
51 changes: 34 additions & 17 deletions paddle/fluid/pybind/eager_math_op_patch.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,8 @@ static PyObject* tensor__add__method(TensorObject* self,
other_tensor = other_tensor_ref;
} else {
if (IsNumpyArray(other_obj)) {
py::object numpy_value = py::object(py::handle(other_obj), true);
py::object numpy_value =
py::reinterpret_borrow<py::object>(py::handle(other_obj));
other_tensor = paddle::Tensor(place);
InitTensorWithNumpyValue(numpy_value, place, &other_tensor);
} else {
Expand Down Expand Up @@ -397,7 +398,8 @@ static PyObject* tensor__sub__method(TensorObject* self,
other_tensor = other_tensor_ref;
} else {
if (IsNumpyArray(other_obj)) {
py::object numpy_value = py::object(py::handle(other_obj), true);
py::object numpy_value =
py::reinterpret_borrow<py::object>(py::handle(other_obj));
other_tensor = paddle::Tensor(place);
InitTensorWithNumpyValue(numpy_value, place, &other_tensor);
} else {
Expand Down Expand Up @@ -499,7 +501,8 @@ static PyObject* tensor__rsub__method(TensorObject* self,
other_tensor = other_tensor_ref;
} else {
if (IsNumpyArray(other_obj)) {
py::object numpy_value = py::object(py::handle(other_obj), true);
py::object numpy_value =
py::reinterpret_borrow<py::object>(py::handle(other_obj));
other_tensor = paddle::Tensor(place);
InitTensorWithNumpyValue(numpy_value, place, &other_tensor);
} else {
Expand Down Expand Up @@ -605,7 +608,8 @@ static PyObject* tensor__mul__method(TensorObject* self,
other_tensor = other_tensor_ref;
} else {
if (IsNumpyArray(other_obj)) {
py::object numpy_value = py::object(py::handle(other_obj), true);
py::object numpy_value =
py::reinterpret_borrow<py::object>(py::handle(other_obj));
other_tensor = paddle::Tensor(place);
InitTensorWithNumpyValue(numpy_value, place, &other_tensor);
} else {
Expand Down Expand Up @@ -708,7 +712,8 @@ static PyObject* tensor__div__method(TensorObject* self,
other_tensor = other_tensor_ref;
} else {
if (IsNumpyArray(other_obj)) {
py::object numpy_value = py::object(py::handle(other_obj), true);
py::object numpy_value =
py::reinterpret_borrow<py::object>(py::handle(other_obj));
other_tensor = paddle::Tensor(place);
InitTensorWithNumpyValue(numpy_value, place, &other_tensor);
} else {
Expand Down Expand Up @@ -814,7 +819,8 @@ static PyObject* tensor__rdiv__method(TensorObject* self,
other_tensor = other_tensor_ref;
} else {
if (IsNumpyArray(other_obj)) {
py::object numpy_value = py::object(py::handle(other_obj), true);
py::object numpy_value =
py::reinterpret_borrow<py::object>(py::handle(other_obj));
other_tensor = paddle::Tensor(place);
InitTensorWithNumpyValue(numpy_value, place, &other_tensor);
} else {
Expand Down Expand Up @@ -924,7 +930,8 @@ static PyObject* tensor__gt__method(TensorObject* self,
other_tensor = other_tensor_ref;
} else {
if (IsNumpyArray(other_obj)) {
py::object numpy_value = py::object(py::handle(other_obj), true);
py::object numpy_value =
py::reinterpret_borrow<py::object>(py::handle(other_obj));
other_tensor = paddle::Tensor(place);
InitTensorWithNumpyValue(numpy_value, place, &other_tensor);
} else {
Expand Down Expand Up @@ -1024,7 +1031,8 @@ static PyObject* tensor__ge__method(TensorObject* self,
other_tensor = other_tensor_ref;
} else {
if (IsNumpyArray(other_obj)) {
py::object numpy_value = py::object(py::handle(other_obj), true);
py::object numpy_value =
py::reinterpret_borrow<py::object>(py::handle(other_obj));
other_tensor = paddle::Tensor(place);
InitTensorWithNumpyValue(numpy_value, place, &other_tensor);
} else {
Expand Down Expand Up @@ -1125,7 +1133,8 @@ static PyObject* tensor__mod__method(TensorObject* self,
other_tensor = other_tensor_ref;
} else {
if (IsNumpyArray(other_obj)) {
py::object numpy_value = py::object(py::handle(other_obj), true);
py::object numpy_value =
py::reinterpret_borrow<py::object>(py::handle(other_obj));
other_tensor = paddle::Tensor(place);
InitTensorWithNumpyValue(numpy_value, place, &other_tensor);
} else {
Expand Down Expand Up @@ -1222,7 +1231,8 @@ static PyObject* tensor__matmul__method(TensorObject* self,
other_tensor = other_tensor_ref;
} else {
if (IsNumpyArray(other_obj)) {
py::object numpy_value = py::object(py::handle(other_obj), true);
py::object numpy_value =
py::reinterpret_borrow<py::object>(py::handle(other_obj));
other_tensor = paddle::Tensor(place);
InitTensorWithNumpyValue(numpy_value, place, &other_tensor);
} else {
Expand Down Expand Up @@ -1350,7 +1360,8 @@ static PyObject* tensor__lt__method(TensorObject* self,
other_tensor = other_tensor_ref;
} else {
if (IsNumpyArray(other_obj)) {
py::object numpy_value = py::object(py::handle(other_obj), true);
py::object numpy_value =
py::reinterpret_borrow<py::object>(py::handle(other_obj));
other_tensor = paddle::Tensor(place);
InitTensorWithNumpyValue(numpy_value, place, &other_tensor);
} else {
Expand Down Expand Up @@ -1450,7 +1461,8 @@ static PyObject* tensor__le__method(TensorObject* self,
other_tensor = other_tensor_ref;
} else {
if (IsNumpyArray(other_obj)) {
py::object numpy_value = py::object(py::handle(other_obj), true);
py::object numpy_value =
py::reinterpret_borrow<py::object>(py::handle(other_obj));
other_tensor = paddle::Tensor(place);
InitTensorWithNumpyValue(numpy_value, place, &other_tensor);
} else {
Expand Down Expand Up @@ -1551,7 +1563,8 @@ static PyObject* tensor__floordiv__method(TensorObject* self,
other_tensor = other_tensor_ref;
} else {
if (IsNumpyArray(other_obj)) {
py::object numpy_value = py::object(py::handle(other_obj), true);
py::object numpy_value =
py::reinterpret_borrow<py::object>(py::handle(other_obj));
other_tensor = paddle::Tensor(place);
InitTensorWithNumpyValue(numpy_value, place, &other_tensor);
} else {
Expand Down Expand Up @@ -1655,7 +1668,8 @@ static PyObject* tensor__pow__method(TensorObject* self,
other_tensor = other_tensor_ref;
} else {
if (IsNumpyArray(other_obj)) {
py::object numpy_value = py::object(py::handle(other_obj), true);
py::object numpy_value =
py::reinterpret_borrow<py::object>(py::handle(other_obj));
other_tensor = paddle::Tensor(place);
InitTensorWithNumpyValue(numpy_value, place, &other_tensor);
} else {
Expand Down Expand Up @@ -1755,7 +1769,8 @@ static PyObject* tensor__rpow__method(TensorObject* self,
other_tensor = other_tensor_ref;
} else {
if (IsNumpyArray(other_obj)) {
py::object numpy_value = py::object(py::handle(other_obj), true);
py::object numpy_value =
py::reinterpret_borrow<py::object>(py::handle(other_obj));
other_tensor = paddle::Tensor(place);
InitTensorWithNumpyValue(numpy_value, place, &other_tensor);
} else {
Expand Down Expand Up @@ -1855,7 +1870,8 @@ static PyObject* tensor__ne__method(TensorObject* self,
other_tensor = other_tensor_ref;
} else {
if (IsNumpyArray(other_obj)) {
py::object numpy_value = py::object(py::handle(other_obj), true);
py::object numpy_value =
py::reinterpret_borrow<py::object>(py::handle(other_obj));
other_tensor = paddle::Tensor(place);
InitTensorWithNumpyValue(numpy_value, place, &other_tensor);
} else {
Expand Down Expand Up @@ -1954,7 +1970,8 @@ static PyObject* tensor__eq__method(TensorObject* self,
other_tensor = other_tensor_ref;
} else {
if (IsNumpyArray(other_obj)) {
py::object numpy_value = py::object(py::handle(other_obj), true);
py::object numpy_value =
py::reinterpret_borrow<py::object>(py::handle(other_obj));
other_tensor = paddle::Tensor(place);
InitTensorWithNumpyValue(numpy_value, place, &other_tensor);
} else {
Expand Down
3 changes: 2 additions & 1 deletion paddle/fluid/pybind/pir.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1113,7 +1113,8 @@ pir::Value apply(Value self, py::object func) {
return py::cast<py::none>(Py_None); \
} \
auto py_data = reinterpret_cast<PyObject *>(prop_ptr); \
py::object obj = py::object(py::handle(py_data), true); \
py::object obj = \
py::reinterpret_borrow<py::object>(py::handle(py_data)); \
return obj; \
}, \
[](Value self, py::object obj) { \
Expand Down
4 changes: 2 additions & 2 deletions paddle/fluid/pybind/slice_utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ static paddle::Tensor dealWithValues(const paddle::Tensor& tensor,
paddle::Tensor value_tensor_tmp(
std::make_shared<phi::DenseTensor>(),
egr::Controller::Instance().GenerateUniqueName());
py::object value_obj_tmp(py::handle(value_obj), true);
py::object value_obj_tmp = py::reinterpret_borrow<py::object>(value_obj);
py::object value = value_obj_tmp;
if (tensor.dtype() == phi::DataType::FLOAT32) {
if (!py::isinstance<py::array_t<float>>(value_obj_tmp)) {
Expand Down Expand Up @@ -595,7 +595,7 @@ static paddle::Tensor dealWithValues(const paddle::Tensor& tensor,
false);
value_tensor = value_tensor_tmp;
} else {
py::object value_obj_tmp(py::handle(value_obj), true);
py::object value_obj_tmp = py::reinterpret_borrow<py::object>(value_obj);
// convert the value to self data type
if (py::isinstance<py::float_>(value_obj_tmp) ||
py::isinstance<py::int_>(value_obj_tmp) ||
Expand Down

0 comments on commit d3bd91f

Please sign in to comment.