Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
1e3d2e4a
P
Paddle
项目概览
PaddlePaddle
/
Paddle
1 年多 前同步成功
通知
2302
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
1e3d2e4a
编写于
4月 30, 2022
作者:
W
Weilong Wu
提交者:
GitHub
4月 30, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Eager] Support test_diff_op switch to eager mode (#42360) (#42392)
上级
e2bc846f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
36 addition
and
9 deletion
+36
-9
paddle/fluid/eager/backward.cc
paddle/fluid/eager/backward.cc
+7
-1
python/paddle/fluid/tests/unittests/test_diff_op.py
python/paddle/fluid/tests/unittests/test_diff_op.py
+17
-2
python/paddle/tensor/math.py
python/paddle/tensor/math.py
+12
-6
未找到文件。
paddle/fluid/eager/backward.cc
浏览文件 @
1e3d2e4a
...
...
@@ -546,7 +546,13 @@ std::vector<paddle::experimental::Tensor> RunBackward(
for
(
size_t
i
=
0
;
i
<
tensors
.
size
();
i
++
)
{
const
paddle
::
experimental
::
Tensor
&
tensor
=
tensors
[
i
];
AutogradMeta
*
auto_grad_meta
=
EagerUtils
::
unsafe_autograd_meta
(
tensor
);
AutogradMeta
*
auto_grad_meta
=
EagerUtils
::
nullable_autograd_meta
(
tensor
);
if
(
auto_grad_meta
==
nullptr
)
{
VLOG
(
3
)
<<
"Skip auto grad since there is no grad op for var or loss is "
"stop_gradient=True: "
<<
tensor
.
name
();
continue
;
}
// Get grad input info from target tensors
auto
input_info
=
auto_grad_meta
->
OutRankInfo
();
...
...
python/paddle/fluid/tests/unittests/test_diff_op.py
浏览文件 @
1e3d2e4a
...
...
@@ -19,6 +19,7 @@ import paddle
import
paddle.fluid
as
fluid
import
paddle.fluid.layers
as
layers
import
paddle.fluid.core
as
core
from
paddle.fluid.framework
import
_test_eager_guard
class
TestDiffOp
(
unittest
.
TestCase
):
...
...
@@ -53,7 +54,7 @@ class TestDiffOp(unittest.TestCase):
if
core
.
is_compiled_with_cuda
():
self
.
places
.
append
(
paddle
.
CUDAPlace
(
0
))
def
test
_dygraph
(
self
):
def
func
_dygraph
(
self
):
for
place
in
self
.
places
:
paddle
.
disable_static
()
x
=
paddle
.
to_tensor
(
self
.
input
,
place
=
place
)
...
...
@@ -69,6 +70,13 @@ class TestDiffOp(unittest.TestCase):
append
=
self
.
append
)
self
.
assertTrue
((
out
.
numpy
()
==
self
.
output
).
all
(),
True
)
def
test_dygraph
(
self
):
with
_test_eager_guard
():
self
.
setUp
()
self
.
func_dygraph
()
self
.
setUp
()
self
.
func_dygraph
()
def
test_static
(
self
):
paddle
.
enable_static
()
places
=
[
fluid
.
CPUPlace
()]
...
...
@@ -108,7 +116,7 @@ class TestDiffOp(unittest.TestCase):
fetch_list
=
[
out
])
self
.
assertTrue
((
fetches
[
0
]
==
self
.
output
).
all
(),
True
)
def
test
_grad
(
self
):
def
func
_grad
(
self
):
for
place
in
self
.
places
:
x
=
paddle
.
to_tensor
(
self
.
input
,
place
=
place
,
stop_gradient
=
False
)
if
self
.
prepend
is
not
None
:
...
...
@@ -127,6 +135,13 @@ class TestDiffOp(unittest.TestCase):
except
:
raise
RuntimeError
(
"Check Diff Gradient Failed"
)
def
test_grad
(
self
):
with
_test_eager_guard
():
self
.
setUp
()
self
.
func_grad
()
self
.
setUp
()
self
.
func_grad
()
class
TestDiffOpAxis
(
TestDiffOp
):
def
set_args
(
self
):
...
...
python/paddle/tensor/math.py
浏览文件 @
1e3d2e4a
...
...
@@ -3999,15 +3999,21 @@ def diff(x, n=1, axis=-1, prepend=None, append=None, name=None):
attrs_2
+=
(
'starts'
,
starts_2
)
ends_2
=
[
dim_len
]
attrs_2
+=
(
'ends'
,
ends_2
)
input_back
=
_C_ops
.
slice
(
new_input
,
None
,
None
,
None
,
None
,
'axes'
,
axes
,
\
'infer_flags'
,
infer_flags
,
*
attrs_2
)
if
in_dygraph_mode
():
input_back
=
_C_ops
.
final_state_slice
(
new_input
,
axes
,
starts_2
,
ends_2
,
infer_flags
,
[])
else
:
input_back
=
_C_ops
.
slice
(
new_input
,
None
,
None
,
None
,
None
,
'axes'
,
axes
,
\
'infer_flags'
,
infer_flags
,
*
attrs_2
)
if
x
.
dtype
==
paddle
.
bool
:
op
=
getattr
(
_C_ops
,
"logical_xor"
)
out
=
op
(
input_back
,
input_front
)
if
in_dygraph_mode
():
return
_C_ops
.
final_state_logical_xor
(
input_back
,
input_front
)
else
:
return
_C_ops
.
logical_xor
(
input_back
,
input_front
)
else
:
out
=
elementwise_sub
(
input_back
,
input_front
,
axis
=
axis
)
return
out
return
elementwise_sub
(
input_back
,
input_front
,
axis
=
axis
)
else
:
check_variable_and_dtype
(
x
,
'x'
,
[
'float32'
,
'float64'
,
'bool'
,
'int32'
,
'int64'
],
'diff'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录