Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
magicwindyyd
mindspore
提交
cf797d3b
M
mindspore
项目概览
magicwindyyd
/
mindspore
与 Fork 源项目一致
Fork自
MindSpore / mindspore
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
mindspore
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
cf797d3b
编写于
7月 10, 2020
作者:
B
buxue
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add arg check for enumerate
上级
4670b58c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
37 addition
and
5 deletion
+37
-5
mindspore/_extends/parse/standard_method.py
mindspore/_extends/parse/standard_method.py
+15
-3
tests/ut/python/pipeline/parse/test_enumerate.py
tests/ut/python/pipeline/parse/test_enumerate.py
+22
-2
未找到文件。
mindspore/_extends/parse/standard_method.py
浏览文件 @
cf797d3b
...
...
@@ -108,7 +108,8 @@ def enumerate_(x, start=0):
"""Enumerate list or tuple."""
x_type
=
F
.
typeof
(
x
)
ret
=
()
if
check_is_tuple_or_list
(
x_type
,
"enumerate"
):
op_name
=
"enumerate"
if
check_is_tuple_or_list
(
x_type
,
op_name
,
"first input"
)
and
check_is_const_int
(
start
,
op_name
,
"start"
):
ret
=
zip
(
range
(
start
,
start
+
len
(
x
)),
x
)
return
ret
...
...
@@ -123,11 +124,22 @@ def while_cond(x):
@
constexpr
def
check_is_tuple_or_list
(
x
,
op_name
):
def
check_is_tuple_or_list
(
x
,
op_name
,
arg_name
):
"""check whether x is list or tuple."""
if
isinstance
(
x
,
(
mstype
.
list_type
,
mstype
.
tuple_type
)):
return
True
raise
TypeError
(
f
"For '
{
op_name
}
', the input parameter should be tuple or list, but got
{
x
}
."
)
raise
TypeError
(
f
"For '
{
op_name
}
', the '
{
arg_name
}
' should be tuple or list, but got
{
x
}
."
)
@
constexpr
def
check_is_const_int
(
x
,
op_name
,
arg_name
):
"""check whether x is const int."""
if
x
is
None
:
raise
ValueError
(
f
"For '
{
op_name
}
', the '
{
arg_name
}
' should be a const int number, but got not const."
)
if
not
isinstance
(
x
,
int
):
raise
ValueError
(
f
"For '
{
op_name
}
', the '
{
arg_name
}
' should be a const int number, but got
{
x
}
."
)
return
True
@
constexpr
def
check_is_tensor_bool_cond
(
shp
):
...
...
tests/ut/python/pipeline/parse/test_enumerate.py
浏览文件 @
cf797d3b
...
...
@@ -91,6 +91,7 @@ def test_enumerate_tuple_parameter():
index_sum
+=
i
ret
+=
(
j
,)
return
index_sum
,
ret
x
=
Tensor
(
np
.
arange
(
3
*
4
*
5
).
reshape
((
3
,
4
,
5
)))
net
=
Net
()
net
(
x
,
x
,
x
)
...
...
@@ -127,10 +128,12 @@ def test_enumerate_tuple_parameter_1():
index_sum
+=
i
[
0
]
ret
+=
(
i
[
1
],)
return
index_sum
,
ret
x
=
Tensor
(
np
.
arange
(
3
*
4
*
5
).
reshape
((
3
,
4
,
5
)))
net
=
Net
()
net
(
x
,
x
,
x
)
def
test_enumerate_tuple_const_2
():
class
Net
(
nn
.
Cell
):
def
__init__
(
self
):
...
...
@@ -162,20 +165,37 @@ def test_enumerate_tuple_parameter_2():
index_sum
+=
i
[
0
]
ret
+=
(
i
[
1
],)
return
index_sum
,
ret
x
=
Tensor
(
np
.
arange
(
3
*
4
*
5
).
reshape
((
3
,
4
,
5
)))
net
=
Net
()
net
(
x
,
x
,
x
)
def
test_enumerate_
parameter
_type_error
():
def
test_enumerate_
first_input
_type_error
():
class
Net
(
nn
.
Cell
):
def
__init__
(
self
):
super
(
Net
,
self
).
__init__
()
def
construct
(
self
,
x
):
return
enumerate
(
x
)
x
=
Tensor
(
np
.
arange
(
3
*
4
*
5
).
reshape
((
3
,
4
,
5
)))
net
=
Net
()
with
pytest
.
raises
(
TypeError
)
as
ex
:
net
(
x
)
assert
"For 'enumerate', the input parameter should be tuple or list"
in
str
(
ex
.
value
)
assert
"For 'enumerate', the 'first input'"
in
str
(
ex
.
value
)
def
test_enumerate_start_type_error
():
class
Net
(
nn
.
Cell
):
def
__init__
(
self
):
super
(
Net
,
self
).
__init__
()
def
construct
(
self
,
x
):
return
enumerate
(
x
,
start
=
1.2
)
x
=
Tensor
(
np
.
arange
(
3
*
4
*
5
).
reshape
((
3
,
4
,
5
)))
net
=
Net
()
with
pytest
.
raises
(
ValueError
)
as
ex
:
net
((
x
,
x
))
assert
"For 'enumerate', the 'start'"
in
str
(
ex
.
value
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录