Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ujs_wantz
Paddle
提交
54d98963
P
Paddle
项目概览
ujs_wantz
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
54d98963
编写于
8月 05, 2022
作者:
Z
zhangxiaoci
提交者:
GitHub
8月 05, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor xpu tests for squeeze/unsqueeze, *test=kunlun (#44812)
上级
153f1138
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
168 addition
and
123 deletion
+168
-123
paddle/fluid/platform/device/xpu/xpu2_op_list.h
paddle/fluid/platform/device/xpu/xpu2_op_list.h
+32
-0
python/paddle/fluid/tests/unittests/xpu/test_squeeze2_op_xpu.py
.../paddle/fluid/tests/unittests/xpu/test_squeeze2_op_xpu.py
+3
-10
python/paddle/fluid/tests/unittests/xpu/test_squeeze_op_xpu.py
...n/paddle/fluid/tests/unittests/xpu/test_squeeze_op_xpu.py
+67
-53
python/paddle/fluid/tests/unittests/xpu/test_unsqueeze2_op_xpu.py
...addle/fluid/tests/unittests/xpu/test_unsqueeze2_op_xpu.py
+3
-10
python/paddle/fluid/tests/unittests/xpu/test_unsqueeze_op_xpu.py
...paddle/fluid/tests/unittests/xpu/test_unsqueeze_op_xpu.py
+63
-50
未找到文件。
paddle/fluid/platform/device/xpu/xpu2_op_list.h
浏览文件 @
54d98963
...
...
@@ -468,6 +468,22 @@ XPUOpMap& get_kl2_ops() {
pOpKernelType
(
vartype
::
INT8
,
XPUPlace
()),
pOpKernelType
(
vartype
::
UINT8
,
XPUPlace
()),
pOpKernelType
(
vartype
::
FP32
,
XPUPlace
())})},
{
"squeeze_grad"
,
XPUKernelSet
({
pOpKernelType
(
vartype
::
FP64
,
XPUPlace
()),
pOpKernelType
(
vartype
::
INT64
,
XPUPlace
()),
pOpKernelType
(
vartype
::
INT32
,
XPUPlace
()),
pOpKernelType
(
vartype
::
BOOL
,
XPUPlace
()),
pOpKernelType
(
vartype
::
INT8
,
XPUPlace
()),
pOpKernelType
(
vartype
::
UINT8
,
XPUPlace
()),
pOpKernelType
(
vartype
::
FP32
,
XPUPlace
())})},
{
"squeeze"
,
XPUKernelSet
({
pOpKernelType
(
vartype
::
FP64
,
XPUPlace
()),
pOpKernelType
(
vartype
::
INT64
,
XPUPlace
()),
pOpKernelType
(
vartype
::
INT32
,
XPUPlace
()),
pOpKernelType
(
vartype
::
BOOL
,
XPUPlace
()),
pOpKernelType
(
vartype
::
INT8
,
XPUPlace
()),
pOpKernelType
(
vartype
::
UINT8
,
XPUPlace
()),
pOpKernelType
(
vartype
::
FP32
,
XPUPlace
())})},
{
"stack"
,
XPUKernelSet
({
pOpKernelType
(
vartype
::
FP32
,
XPUPlace
()),
pOpKernelType
(
vartype
::
INT64
,
XPUPlace
()),
...
...
@@ -534,6 +550,22 @@ XPUOpMap& get_kl2_ops() {
pOpKernelType
(
vartype
::
UINT8
,
XPUPlace
()),
pOpKernelType
(
vartype
::
FP32
,
XPUPlace
()),
pOpKernelType
(
vartype
::
FP16
,
XPUPlace
())})},
{
"unsqueeze_grad"
,
XPUKernelSet
({
pOpKernelType
(
vartype
::
FP64
,
XPUPlace
()),
pOpKernelType
(
vartype
::
INT64
,
XPUPlace
()),
pOpKernelType
(
vartype
::
INT32
,
XPUPlace
()),
pOpKernelType
(
vartype
::
BOOL
,
XPUPlace
()),
pOpKernelType
(
vartype
::
INT8
,
XPUPlace
()),
pOpKernelType
(
vartype
::
UINT8
,
XPUPlace
()),
pOpKernelType
(
vartype
::
FP32
,
XPUPlace
())})},
{
"unsqueeze"
,
XPUKernelSet
({
pOpKernelType
(
vartype
::
FP64
,
XPUPlace
()),
pOpKernelType
(
vartype
::
INT64
,
XPUPlace
()),
pOpKernelType
(
vartype
::
INT32
,
XPUPlace
()),
pOpKernelType
(
vartype
::
BOOL
,
XPUPlace
()),
pOpKernelType
(
vartype
::
INT8
,
XPUPlace
()),
pOpKernelType
(
vartype
::
UINT8
,
XPUPlace
()),
pOpKernelType
(
vartype
::
FP32
,
XPUPlace
())})},
{
"where_index"
,
XPUKernelSet
({
pOpKernelType
(
vartype
::
INT32
,
XPUPlace
()),
pOpKernelType
(
vartype
::
BOOL
,
XPUPlace
()),
...
...
python/paddle/fluid/tests/unittests/xpu/test_squeeze2_op_xpu.py
浏览文件 @
54d98963
# Copyright (c) 20
19
PaddlePaddle Authors. All Rights Reserved.
# Copyright (c) 20
22
PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
@@ -68,17 +68,10 @@ class XPUTestSqueeze2Op(XPUOpTestWrapper):
def
test_check_grad
(
self
):
place
=
paddle
.
XPUPlace
(
0
)
if
self
.
dtype
in
[
np
.
float32
,
np
.
float64
]:
self
.
check_grad_with_place
(
place
,
[
'X'
],
'Out'
)
elif
self
.
dtype
==
np
.
bool_
:
if
self
.
dtype
==
np
.
bool_
:
return
else
:
user_defined_grad_outputs
=
np
.
random
.
random
(
self
.
new_shape
).
astype
(
self
.
dtype
)
self
.
check_grad_with_place
(
place
,
[
'X'
],
'Out'
,
user_defined_grad_outputs
=
user_defined_grad_outputs
)
self
.
check_grad_with_place
(
place
,
[
'X'
],
'Out'
)
# Correct: There is mins axis.
class
TestSqueeze2Op1
(
TestSqueeze2Op
):
...
...
python/paddle/fluid/tests/unittests/xpu/test_squeeze_op_xpu.py
浏览文件 @
54d98963
# Copyright (c) 20
19
PaddlePaddle Authors. All Rights Reserved.
# Copyright (c) 20
22
PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
@@ -22,35 +22,49 @@ import numpy as np
import
paddle
import
paddle.fluid
as
fluid
from
paddle.fluid
import
compiler
,
Program
,
program_guard
from
paddle.fluid
import
Program
,
program_guard
from
op_test
import
OpTest
from
op_test_xpu
import
XPUOpTest
from
xpu.get_test_cover_info
import
create_test_class
,
get_xpu_op_support_types
,
XPUOpTestWrapper
paddle
.
enable_static
()
# Correct: General.
class
TestSqueezeOp
(
XPUOpTest
):
class
XPUTestSqueezeOp
(
XPUOpTestWrapper
):
def
__init__
(
self
):
self
.
op_name
=
"squeeze"
self
.
use_dynamic_create_class
=
False
# Correct: General.
class
TestSqueezeOp
(
XPUOpTest
):
def
setUp
(
self
):
self
.
op_type
=
"squeeze"
self
.
use_xpu
=
True
self
.
__class__
.
op_type
=
"squeeze"
self
.
use_mkldnn
=
False
self
.
init_dtype
()
self
.
init_test_case
()
self
.
inputs
=
{
"X"
:
np
.
random
.
random
(
self
.
ori_shape
).
astype
(
"float32"
)}
self
.
inputs
=
{
"X"
:
np
.
random
.
random
(
self
.
ori_shape
).
astype
(
self
.
dtype
)
}
self
.
init_attrs
()
self
.
outputs
=
{
"Out"
:
self
.
inputs
[
"X"
].
reshape
(
self
.
new_shape
),
}
def
init_dtype
(
self
):
self
.
dtype
=
self
.
in_type
def
test_check_output
(
self
):
if
paddle
.
is_compiled_with_xpu
():
place
=
paddle
.
XPUPlace
(
0
)
self
.
check_output_with_place
(
place
)
def
test_check_grad
(
self
):
if
paddle
.
is_compiled_with_xpu
():
place
=
paddle
.
XPUPlace
(
0
)
if
self
.
dtype
==
np
.
bool_
:
return
else
:
self
.
check_grad_with_place
(
place
,
[
'X'
],
'Out'
)
def
init_test_case
(
self
):
...
...
@@ -61,36 +75,32 @@ class TestSqueezeOp(XPUOpTest):
def
init_attrs
(
self
):
self
.
attrs
=
{
"axes"
:
self
.
axes
}
# Correct: There is mins axis.
class
TestSqueezeOp1
(
TestSqueezeOp
):
# Correct: There is mins axis.
class
TestSqueezeOp1
(
TestSqueezeOp
):
def
init_test_case
(
self
):
self
.
ori_shape
=
(
1
,
3
,
1
,
40
)
self
.
axes
=
(
0
,
-
2
)
self
.
new_shape
=
(
3
,
40
)
# Correct: No axes input.
class
TestSqueezeOp2
(
TestSqueezeOp
):
# Correct: No axes input.
class
TestSqueezeOp2
(
TestSqueezeOp
):
def
init_test_case
(
self
):
self
.
ori_shape
=
(
1
,
20
,
1
,
5
)
self
.
axes
=
()
self
.
new_shape
=
(
20
,
5
)
# Correct: Just part of axes be squeezed.
class
TestSqueezeOp3
(
TestSqueezeOp
):
# Correct: Just part of axes be squeezed.
class
TestSqueezeOp3
(
TestSqueezeOp
):
def
init_test_case
(
self
):
self
.
ori_shape
=
(
6
,
1
,
5
,
1
,
4
,
1
)
self
.
axes
=
(
1
,
-
1
)
self
.
new_shape
=
(
6
,
5
,
1
,
4
)
# Correct: The demension of axis is not of size 1 remains unchanged.
class
TestSqueezeOp4
(
TestSqueezeOp
):
# Correct: The demension of axis is not of size 1 remains unchanged.
class
TestSqueezeOp4
(
TestSqueezeOp
):
def
init_test_case
(
self
):
self
.
ori_shape
=
(
6
,
1
,
5
,
1
,
4
,
1
)
...
...
@@ -115,5 +125,9 @@ class TestSqueezeOpError(unittest.TestCase):
self
.
assertRaises
(
TypeError
,
paddle
.
squeeze
,
x3
,
axes
=
0
)
support_types
=
get_xpu_op_support_types
(
"squeeze"
)
for
stype
in
support_types
:
create_test_class
(
globals
(),
XPUTestSqueezeOp
,
stype
)
if
__name__
==
"__main__"
:
unittest
.
main
()
python/paddle/fluid/tests/unittests/xpu/test_unsqueeze2_op_xpu.py
浏览文件 @
54d98963
# Copyright (c) 20
18
PaddlePaddle Authors. All Rights Reserved.
# Copyright (c) 20
22
PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
@@ -69,17 +69,10 @@ class XPUTestUnsqueeze2Op(XPUOpTestWrapper):
def
test_check_grad
(
self
):
place
=
paddle
.
XPUPlace
(
0
)
if
self
.
dtype
in
[
np
.
float32
,
np
.
float64
,
np
.
float16
]:
self
.
check_grad_with_place
(
place
,
[
'X'
],
'Out'
)
elif
self
.
dtype
==
np
.
bool_
:
if
self
.
dtype
==
np
.
bool_
:
return
else
:
user_defined_grad_outputs
=
np
.
random
.
random
(
self
.
new_shape
).
astype
(
self
.
dtype
)
self
.
check_grad_with_place
(
place
,
[
'X'
],
'Out'
,
user_defined_grad_outputs
=
user_defined_grad_outputs
)
self
.
check_grad_with_place
(
place
,
[
'X'
],
'Out'
)
# Correct: Single input index.
class
TestUnsqueeze2Op1
(
TestUnsqueeze2Op
):
...
...
python/paddle/fluid/tests/unittests/xpu/test_unsqueeze_op_xpu.py
浏览文件 @
54d98963
# Copyright (c) 20
18
PaddlePaddle Authors. All Rights Reserved.
# Copyright (c) 20
22
PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
@@ -24,30 +24,43 @@ import paddle
import
paddle.fluid
as
fluid
from
op_test
import
OpTest
from
op_test_xpu
import
XPUOpTest
from
xpu.get_test_cover_info
import
create_test_class
,
get_xpu_op_support_types
,
XPUOpTestWrapper
paddle
.
enable_static
()
# Correct: General.
class
TestUnsqueezeOp
(
XPUOpTest
):
class
XPUTestUnsqueezeOp
(
XPUOpTestWrapper
):
def
__init__
(
self
):
self
.
op_name
=
"unsqueeze"
self
.
use_dynamic_create_class
=
False
class
TestUnsqueezeOp
(
XPUOpTest
):
def
setUp
(
self
):
self
.
init_test_case
()
self
.
op_type
=
"unsqueeze"
self
.
use_xpu
=
True
self
.
__class__
.
op_type
=
"unsqueeze"
self
.
use_mkldnn
=
False
self
.
inputs
=
{
"X"
:
np
.
random
.
random
(
self
.
ori_shape
).
astype
(
"float32"
)}
self
.
init_test_case
()
self
.
inputs
=
{
"X"
:
np
.
random
.
random
(
self
.
ori_shape
).
astype
(
self
.
dtype
)
}
self
.
init_attrs
()
self
.
outputs
=
{
"Out"
:
self
.
inputs
[
"X"
].
reshape
(
self
.
new_shape
)}
def
init_dtype
(
self
):
self
.
dtype
=
self
.
in_type
def
test_check_output
(
self
):
if
paddle
.
is_compiled_with_xpu
():
place
=
paddle
.
XPUPlace
(
0
)
self
.
check_output_with_place
(
place
)
def
test_check_grad
(
self
):
if
paddle
.
is_compiled_with_xpu
():
place
=
paddle
.
XPUPlace
(
0
)
if
self
.
dtype
==
np
.
bool_
:
return
else
:
self
.
check_grad_with_place
(
place
,
[
'X'
],
'Out'
)
def
init_test_case
(
self
):
...
...
@@ -58,36 +71,32 @@ class TestUnsqueezeOp(XPUOpTest):
def
init_attrs
(
self
):
self
.
attrs
=
{
"axes"
:
self
.
axes
}
# Correct: Single input index.
class
TestUnsqueezeOp1
(
TestUnsqueezeOp
):
# Correct: Single input index.
class
TestUnsqueezeOp1
(
TestUnsqueezeOp
):
def
init_test_case
(
self
):
self
.
ori_shape
=
(
20
,
5
)
self
.
axes
=
(
-
1
,
)
self
.
new_shape
=
(
20
,
5
,
1
)
# Correct: Mixed input axis.
class
TestUnsqueezeOp2
(
TestUnsqueezeOp
):
# Correct: Mixed input axis.
class
TestUnsqueezeOp2
(
TestUnsqueezeOp
):
def
init_test_case
(
self
):
self
.
ori_shape
=
(
20
,
5
)
self
.
axes
=
(
0
,
-
1
)
self
.
new_shape
=
(
1
,
20
,
5
,
1
)
# Correct: There is duplicated axis.
class
TestUnsqueezeOp3
(
TestUnsqueezeOp
):
# Correct: There is duplicated axis.
class
TestUnsqueezeOp3
(
TestUnsqueezeOp
):
def
init_test_case
(
self
):
self
.
ori_shape
=
(
10
,
2
,
5
)
self
.
axes
=
(
0
,
3
,
3
)
self
.
new_shape
=
(
1
,
10
,
2
,
1
,
1
,
5
)
# Correct: Reversed axes.
class
TestUnsqueezeOp4
(
TestUnsqueezeOp
):
# Correct: Reversed axes.
class
TestUnsqueezeOp4
(
TestUnsqueezeOp
):
def
init_test_case
(
self
):
self
.
ori_shape
=
(
10
,
2
,
5
)
...
...
@@ -95,5 +104,9 @@ class TestUnsqueezeOp4(TestUnsqueezeOp):
self
.
new_shape
=
(
10
,
1
,
1
,
2
,
5
,
1
)
support_types
=
get_xpu_op_support_types
(
"unsqueeze"
)
for
stype
in
support_types
:
create_test_class
(
globals
(),
XPUTestUnsqueezeOp
,
stype
)
if
__name__
==
"__main__"
:
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录