Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
39d5bb6d
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看板
未验证
提交
39d5bb6d
编写于
9月 07, 2020
作者:
W
wawltor
提交者:
GitHub
9月 07, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
udpate the dtype check for the argmin, argmax
fix the bug for dtype check for the argmin/argmax
上级
9b7692b1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
12 deletion
+12
-12
python/paddle/fluid/tests/unittests/test_arg_min_max_v2_op.py
...on/paddle/fluid/tests/unittests/test_arg_min_max_v2_op.py
+4
-4
python/paddle/tensor/search.py
python/paddle/tensor/search.py
+8
-8
未找到文件。
python/paddle/fluid/tests/unittests/test_arg_min_max_v2_op.py
浏览文件 @
39d5bb6d
...
@@ -325,16 +325,16 @@ class TestArgMinMaxOpError(unittest.TestCase):
...
@@ -325,16 +325,16 @@ class TestArgMinMaxOpError(unittest.TestCase):
def
test_argmax_dtype_type
():
def
test_argmax_dtype_type
():
data
=
paddle
.
static
.
data
(
data
=
paddle
.
static
.
data
(
name
=
"test_argmax"
,
shape
=
[
10
],
dtype
=
"float32"
)
name
=
"test_argmax"
,
shape
=
[
10
],
dtype
=
"float32"
)
output
=
paddle
.
argmax
(
x
=
data
,
dtype
=
1
)
output
=
paddle
.
argmax
(
x
=
data
,
dtype
=
None
)
self
.
assertRaises
(
Typ
eError
,
test_argmax_dtype_type
)
self
.
assertRaises
(
Valu
eError
,
test_argmax_dtype_type
)
def
test_argmin_dtype_type
():
def
test_argmin_dtype_type
():
data
=
paddle
.
static
.
data
(
data
=
paddle
.
static
.
data
(
name
=
"test_argmin"
,
shape
=
[
10
],
dtype
=
"float32"
)
name
=
"test_argmin"
,
shape
=
[
10
],
dtype
=
"float32"
)
output
=
paddle
.
argmin
(
x
=
data
,
dtype
=
1
)
output
=
paddle
.
argmin
(
x
=
data
,
dtype
=
None
)
self
.
assertRaises
(
Typ
eError
,
test_argmin_dtype_type
)
self
.
assertRaises
(
Valu
eError
,
test_argmin_dtype_type
)
if
__name__
==
'__main__'
:
if
__name__
==
'__main__'
:
...
...
python/paddle/tensor/search.py
浏览文件 @
39d5bb6d
...
@@ -167,10 +167,10 @@ def argmax(x, axis=None, keepdim=False, dtype="int64", name=None):
...
@@ -167,10 +167,10 @@ def argmax(x, axis=None, keepdim=False, dtype="int64", name=None):
"The type of 'axis' must be int or None in argmax, but received %s."
"The type of 'axis' must be int or None in argmax, but received %s."
%
(
type
(
axis
)))
%
(
type
(
axis
)))
if
not
(
isinstance
(
dtype
,
str
)
or
isinstance
(
dtype
,
np
.
dtype
))
:
if
dtype
is
None
:
raise
Typ
eError
(
raise
Valu
eError
(
"the
type of 'dtype' in argmax must be str or np.dtype, but received {}"
.
"the
value of 'dtype' in argmax could not be None, but received None"
format
(
type
(
dtype
))
)
)
var_dtype
=
convert_np_dtype_to_dtype_
(
dtype
)
var_dtype
=
convert_np_dtype_to_dtype_
(
dtype
)
check_dtype
(
var_dtype
,
'dtype'
,
[
'int32'
,
'int64'
],
'argmin'
)
check_dtype
(
var_dtype
,
'dtype'
,
[
'int32'
,
'int64'
],
'argmin'
)
...
@@ -245,10 +245,10 @@ def argmin(x, axis=None, keepdim=False, dtype="int64", name=None):
...
@@ -245,10 +245,10 @@ def argmin(x, axis=None, keepdim=False, dtype="int64", name=None):
"The type of 'axis' must be int or None in argmin, but received %s."
"The type of 'axis' must be int or None in argmin, but received %s."
%
(
type
(
axis
)))
%
(
type
(
axis
)))
if
not
(
isinstance
(
dtype
,
str
)
or
isinstance
(
dtype
,
np
.
dtype
))
:
if
dtype
is
None
:
raise
Typ
eError
(
raise
Valu
eError
(
"the
type of 'dtype' in argmin must be str or np.dtype, but received {}"
.
"the
value of 'dtype' in argmin could not be None, but received None"
format
(
dtype
(
dtype
))
)
)
var_dtype
=
convert_np_dtype_to_dtype_
(
dtype
)
var_dtype
=
convert_np_dtype_to_dtype_
(
dtype
)
check_dtype
(
var_dtype
,
'dtype'
,
[
'int32'
,
'int64'
],
'argmin'
)
check_dtype
(
var_dtype
,
'dtype'
,
[
'int32'
,
'int64'
],
'argmin'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录