Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MegEngine 天元
MegEngine
提交
2318ea3f
MegEngine
项目概览
MegEngine 天元
/
MegEngine
1 年多 前同步成功
通知
403
Star
4705
Fork
582
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
MegEngine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
2318ea3f
编写于
11月 19, 2021
作者:
M
Megvii Engine Team
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(dnn): fix naive average pooling overflow bug for int8 type
GitOrigin-RevId: b60a7b6cf824d104efbc7c22020220898cdff4fe
上级
f64a2e02
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
44 addition
and
3 deletion
+44
-3
dnn/src/naive/pooling/opr_impl.cpp
dnn/src/naive/pooling/opr_impl.cpp
+13
-3
dnn/test/naive/pooling.cpp
dnn/test/naive/pooling.cpp
+31
-0
未找到文件。
dnn/src/naive/pooling/opr_impl.cpp
浏览文件 @
2318ea3f
...
@@ -47,6 +47,8 @@ struct MaxPooler {
...
@@ -47,6 +47,8 @@ struct MaxPooler {
}
}
};
};
//! WARNING:for Integer, if sum ctype_ set incorrectly may cause overflow such as
//! (stype_=ctype_ =int8_t)
template
<
typename
stype_
,
typename
ctype_
>
template
<
typename
stype_
,
typename
ctype_
>
struct
MeanIncludePoolerBase
{
struct
MeanIncludePoolerBase
{
using
stype
=
stype_
;
using
stype
=
stype_
;
...
@@ -65,6 +67,7 @@ struct MeanIncludePooler : public MeanIncludePoolerBase<T, T> {
...
@@ -65,6 +67,7 @@ struct MeanIncludePooler : public MeanIncludePoolerBase<T, T> {
ctype
get_ans
()
{
return
this
->
sum
/
this
->
count
;
}
ctype
get_ans
()
{
return
this
->
sum
/
this
->
count
;
}
};
};
//! WARNING: the result is truncated
template
<
>
template
<
>
struct
MeanIncludePooler
<
int8_t
>
:
public
MeanIncludePoolerBase
<
int8_t
,
int32_t
>
{
struct
MeanIncludePooler
<
int8_t
>
:
public
MeanIncludePoolerBase
<
int8_t
,
int32_t
>
{
using
MeanIncludePoolerBase
::
MeanIncludePoolerBase
;
using
MeanIncludePoolerBase
::
MeanIncludePoolerBase
;
...
@@ -74,7 +77,9 @@ struct MeanIncludePooler<int8_t> : public MeanIncludePoolerBase<int8_t, int32_t>
...
@@ -74,7 +77,9 @@ struct MeanIncludePooler<int8_t> : public MeanIncludePoolerBase<int8_t, int32_t>
std
::
numeric_limits
<
int8_t
>::
max
());
std
::
numeric_limits
<
int8_t
>::
max
());
}
}
};
};
/*!
* average pooling with zero point for quint8
/*/
template
<
>
template
<
>
struct
MeanIncludePooler
<
dt_quint8
>
{
struct
MeanIncludePooler
<
dt_quint8
>
{
int32_t
sum
;
int32_t
sum
;
...
@@ -107,7 +112,7 @@ struct MeanIncludePooler<dt_quint8> {
...
@@ -107,7 +112,7 @@ struct MeanIncludePooler<dt_quint8> {
/*!
/*!
* \brief Average pooling operation within a single window.
* \brief Average pooling operation within a single window.
* Works on integers. Rounds toward
+INF.
* Works on integers. Rounds toward
nearest Integer
* \tparam T input data type
* \tparam T input data type
* \tparam U convert input data type to U before accumulating
* \tparam U convert input data type to U before accumulating
* \tparam ICType data type for intermediate result
* \tparam ICType data type for intermediate result
...
@@ -228,10 +233,11 @@ struct MeanExcludePooler {
...
@@ -228,10 +233,11 @@ struct MeanExcludePooler {
/*!
/*!
* \brief Average pooling operation within a single window.
* \brief Average pooling operation within a single window.
* Works on integers. Rounds toward
+INF.
* Works on integers. Rounds toward
nearest Integer
* \tparam T input data type
* \tparam T input data type
* \tparam U convert input data type to U before accumulating
* \tparam U convert input data type to U before accumulating
* \tparam ICType data type for intermediate result
* \tparam ICType data type for intermediate result
* WARNING:for Integer, if type U or ICType set incorrectly may cause overflow
*/
*/
template
<
typename
T
,
typename
U
,
typename
ICType
=
U
>
template
<
typename
T
,
typename
U
,
typename
ICType
=
U
>
struct
MeanExcludeRoundedPooler
{
struct
MeanExcludeRoundedPooler
{
...
@@ -256,6 +262,10 @@ struct MeanExcludeRoundedPooler {
...
@@ -256,6 +262,10 @@ struct MeanExcludeRoundedPooler {
}
}
};
};
template
<
>
struct
MeanExcludePooler
<
int8_t
>
:
MeanExcludeRoundedPooler
<
int8_t
,
int8_t
,
int32_t
>
{
using
MeanExcludeRoundedPooler
::
MeanExcludeRoundedPooler
;
};
template
<
>
template
<
>
struct
MeanExcludePooler
<
dt_quint8
>
struct
MeanExcludePooler
<
dt_quint8
>
:
MeanExcludeRoundedPooler
<
dt_quint8
,
uint8_t
,
uint32_t
>
{
:
MeanExcludeRoundedPooler
<
dt_quint8
,
uint8_t
,
uint32_t
>
{
...
...
dnn/test/naive/pooling.cpp
浏览文件 @
2318ea3f
...
@@ -100,4 +100,35 @@ TEST_F(NAIVE, POOLING_QUANTIZED_Q4) {
...
@@ -100,4 +100,35 @@ TEST_F(NAIVE, POOLING_QUANTIZED_Q4) {
TensorValueLowbit4
({
1
,
1
,
2
,
2
},
u4_dt
,
u8_avg_exclu_dst_vec
)});
TensorValueLowbit4
({
1
,
1
,
2
,
2
},
u4_dt
,
u8_avg_exclu_dst_vec
)});
}
}
}
}
TEST_F
(
NAIVE
,
POOLING_INT_AVERAGE
)
{
using
Mode
=
Pooling
::
Param
::
Mode
;
Checker
<
Pooling
>
checker
(
handle
(),
/* check_dispatch */
false
);
auto
dt
=
dtype
::
Int8
();
Pooling
::
Param
param
=
{
Mode
::
AVERAGE
,
0
,
0
,
1
,
1
,
2
,
2
};
Testcase
input_positive
{
TensorValue
(
{
1
,
1
,
3
,
3
},
dt
,
{
127
,
127
,
127
,
127
,
127
,
127
,
127
,
127
,
127
}),
{}};
Testcase
input_negative
{
TensorValue
(
{
1
,
1
,
3
,
3
},
dt
,
{
-
127
,
-
127
,
-
127
,
-
127
,
-
127
,
-
127
,
-
127
,
-
127
,
-
127
}),
{}};
checker
.
set_param
(
param
).
exect
(
input_positive
,
Testcase
{{},
TensorValue
({
1
,
1
,
2
,
2
},
dt
,
{
127
,
127
,
127
,
127
})});
checker
.
set_param
(
param
).
exect
(
input_negative
,
Testcase
{{},
TensorValue
({
1
,
1
,
2
,
2
},
dt
,
{
-
127
,
-
127
,
-
127
,
-
127
})});
param
=
{
Mode
::
AVERAGE_COUNT_EXCLUDE_PADDING
,
0
,
0
,
1
,
1
,
2
,
2
};
checker
.
set_param
(
param
).
exect
(
input_positive
,
Testcase
{{},
TensorValue
({
1
,
1
,
2
,
2
},
dt
,
{
127
,
127
,
127
,
127
})});
checker
.
set_param
(
param
).
exect
(
input_negative
,
Testcase
{{},
TensorValue
({
1
,
1
,
2
,
2
},
dt
,
{
-
127
,
-
127
,
-
127
,
-
127
})});
}
// vim: syntax=cpp.doxygen
// vim: syntax=cpp.doxygen
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录