Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
5c7fce47
P
Paddle
项目概览
BaiXuePrincess
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
5c7fce47
编写于
11月 09, 2022
作者:
W
wanghuancoder
提交者:
GitHub
11月 09, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refine python call error report (#47724)
* refine python call error report
上级
4b0f1b0c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
2 deletion
+16
-2
paddle/fluid/eager/saved_tensors_hooks.cc
paddle/fluid/eager/saved_tensors_hooks.cc
+12
-0
paddle/fluid/pybind/eager_py_layer.cc
paddle/fluid/pybind/eager_py_layer.cc
+2
-0
paddle/fluid/pybind/eager_utils.cc
paddle/fluid/pybind/eager_utils.cc
+2
-2
未找到文件。
paddle/fluid/eager/saved_tensors_hooks.cc
浏览文件 @
5c7fce47
...
@@ -36,6 +36,9 @@ void* PackHook::operator()(const paddle::experimental::Tensor& tensor) {
...
@@ -36,6 +36,9 @@ void* PackHook::operator()(const paddle::experimental::Tensor& tensor) {
auto
args
=
PyTuple_New
(
1
);
auto
args
=
PyTuple_New
(
1
);
PyTuple_SET_ITEM
(
args
,
0
,
paddle
::
pybind
::
ToPyObject
(
tensor
));
PyTuple_SET_ITEM
(
args
,
0
,
paddle
::
pybind
::
ToPyObject
(
tensor
));
PyObject
*
ret
=
PyObject_Call
(
hook_
,
args
,
nullptr
);
PyObject
*
ret
=
PyObject_Call
(
hook_
,
args
,
nullptr
);
PADDLE_ENFORCE_NOT_NULL
(
ret
,
paddle
::
platform
::
errors
::
External
(
pybind11
::
detail
::
error_string
().
c_str
()));
Py_XDECREF
(
args
);
Py_XDECREF
(
args
);
egr
::
Controller
::
Instance
().
SetHasGrad
(
grad_tmp
);
egr
::
Controller
::
Instance
().
SetHasGrad
(
grad_tmp
);
return
reinterpret_cast
<
void
*>
(
ret
);
return
reinterpret_cast
<
void
*>
(
ret
);
...
@@ -49,6 +52,9 @@ void* PackHook::operator()(void* py_tensor) {
...
@@ -49,6 +52,9 @@ void* PackHook::operator()(void* py_tensor) {
Py_INCREF
(
reinterpret_cast
<
PyObject
*>
(
py_tensor
));
Py_INCREF
(
reinterpret_cast
<
PyObject
*>
(
py_tensor
));
PyTuple_SET_ITEM
(
args
,
0
,
reinterpret_cast
<
PyObject
*>
(
py_tensor
));
PyTuple_SET_ITEM
(
args
,
0
,
reinterpret_cast
<
PyObject
*>
(
py_tensor
));
PyObject
*
ret
=
PyObject_Call
(
hook_
,
args
,
nullptr
);
PyObject
*
ret
=
PyObject_Call
(
hook_
,
args
,
nullptr
);
PADDLE_ENFORCE_NOT_NULL
(
ret
,
paddle
::
platform
::
errors
::
External
(
pybind11
::
detail
::
error_string
().
c_str
()));
Py_XDECREF
(
args
);
Py_XDECREF
(
args
);
egr
::
Controller
::
Instance
().
SetHasGrad
(
grad_tmp
);
egr
::
Controller
::
Instance
().
SetHasGrad
(
grad_tmp
);
return
reinterpret_cast
<
void
*>
(
ret
);
return
reinterpret_cast
<
void
*>
(
ret
);
...
@@ -69,6 +75,9 @@ paddle::experimental::Tensor UnPackHook::operator()(void* packed_value) {
...
@@ -69,6 +75,9 @@ paddle::experimental::Tensor UnPackHook::operator()(void* packed_value) {
Py_INCREF
(
reinterpret_cast
<
PyObject
*>
(
packed_value
));
Py_INCREF
(
reinterpret_cast
<
PyObject
*>
(
packed_value
));
PyTuple_SET_ITEM
(
args
,
0
,
reinterpret_cast
<
PyObject
*>
(
packed_value
));
PyTuple_SET_ITEM
(
args
,
0
,
reinterpret_cast
<
PyObject
*>
(
packed_value
));
PyObject
*
ret
=
PyObject_Call
(
hook_
,
args
,
nullptr
);
PyObject
*
ret
=
PyObject_Call
(
hook_
,
args
,
nullptr
);
PADDLE_ENFORCE_NOT_NULL
(
ret
,
paddle
::
platform
::
errors
::
External
(
pybind11
::
detail
::
error_string
().
c_str
()));
Py_XDECREF
(
args
);
Py_XDECREF
(
args
);
egr
::
Controller
::
Instance
().
SetHasGrad
(
grad_tmp
);
egr
::
Controller
::
Instance
().
SetHasGrad
(
grad_tmp
);
...
@@ -91,6 +100,9 @@ void* UnPackHook::operator()(void* packed_value, void* other) {
...
@@ -91,6 +100,9 @@ void* UnPackHook::operator()(void* packed_value, void* other) {
Py_INCREF
(
reinterpret_cast
<
PyObject
*>
(
packed_value
));
Py_INCREF
(
reinterpret_cast
<
PyObject
*>
(
packed_value
));
PyTuple_SET_ITEM
(
args
,
0
,
reinterpret_cast
<
PyObject
*>
(
packed_value
));
PyTuple_SET_ITEM
(
args
,
0
,
reinterpret_cast
<
PyObject
*>
(
packed_value
));
PyObject
*
ret
=
PyObject_Call
(
hook_
,
args
,
nullptr
);
PyObject
*
ret
=
PyObject_Call
(
hook_
,
args
,
nullptr
);
PADDLE_ENFORCE_NOT_NULL
(
ret
,
paddle
::
platform
::
errors
::
External
(
pybind11
::
detail
::
error_string
().
c_str
()));
Py_XDECREF
(
args
);
Py_XDECREF
(
args
);
egr
::
Controller
::
Instance
().
SetHasGrad
(
grad_tmp
);
egr
::
Controller
::
Instance
().
SetHasGrad
(
grad_tmp
);
...
...
paddle/fluid/pybind/eager_py_layer.cc
浏览文件 @
5c7fce47
...
@@ -139,6 +139,8 @@ PyObject* pylayer_method_apply(PyObject* cls,
...
@@ -139,6 +139,8 @@ PyObject* pylayer_method_apply(PyObject* cls,
PyLayerObject
*
ctx
=
reinterpret_cast
<
PyLayerObject
*>
(
PyLayerObject
*
ctx
=
reinterpret_cast
<
PyLayerObject
*>
(
PyObject_CallFunctionObjArgs
(
backward_function
,
nullptr
));
PyObject_CallFunctionObjArgs
(
backward_function
,
nullptr
));
if
(
!
ctx
)
{
if
(
!
ctx
)
{
PADDLE_THROW
(
paddle
::
platform
::
errors
::
External
(
pybind11
::
detail
::
error_string
().
c_str
()));
return
nullptr
;
return
nullptr
;
}
}
VLOG
(
6
)
<<
"PyLayer construct PyLayerContext finish..."
;
VLOG
(
6
)
<<
"PyLayer construct PyLayerContext finish..."
;
...
...
paddle/fluid/pybind/eager_utils.cc
浏览文件 @
5c7fce47
...
@@ -1525,8 +1525,8 @@ paddle::experimental::Tensor PyTensorHook::operator()(
...
@@ -1525,8 +1525,8 @@ paddle::experimental::Tensor PyTensorHook::operator()(
}
}
PADDLE_ENFORCE_NOT_NULL
(
res
,
PADDLE_ENFORCE_NOT_NULL
(
res
,
p
latform
::
errors
::
Unavailable
(
p
addle
::
platform
::
errors
::
External
(
"Hook function of Tensor return a nullptr."
));
pybind11
::
detail
::
error_string
().
c_str
()
));
if
(
res
==
Py_None
)
{
if
(
res
==
Py_None
)
{
return
var
;
return
var
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录