Skip to content

MegEngine
MegEngine

MegEngine 天元 / MegEngine
接近 2 年 前同步成功

通知 414
Star 4708
Fork 583
MegEngine
MegEngine
提交 bfe945fb 编写于 作者: M Megvii Engine Team
浏览文件
操作

fix(dnn/arm): fix pooling printf datatype 

GitOrigin-RevId: 056a577fa66c4bc11f0b9ae8d3f4b0469e252ed6
上级 e28dc606
隐藏空白更改
内联 并排
Showing with 56 addition and 53 deletion
dnn/src/arm_common/pooling/algo.cpp
浏览文件 @ bfe945fb
...@@ -649,19 +649,20 @@ void PoolingImpl::AlgoFilter3ModexStridexNCHW44::exec( ...@@ -649,19 +649,20 @@ void PoolingImpl::AlgoFilter3ModexStridexNCHW44::exec(
} \ } \
MIDOUT_END(); MIDOUT_END();
#define DISPATCH_MODE(type, func, stride) \ #define DISPATCH_MODE(type, func, stride) \
switch (param.mode) { \ switch (param.mode) { \
case Mode::MAX: { \ case Mode::MAX: { \
DISPATCH_FUNC(type, func, stride, max); \ DISPATCH_FUNC(type, func, stride, max); \
break; \ break; \
} \ } \
case Mode::AVERAGE: { \ case Mode::AVERAGE: { \
DISPATCH_FUNC(type, func, stride, avg); \ DISPATCH_FUNC(type, func, stride, avg); \
break; \ break; \
} \ } \
default: \ default: \
megdnn_throw(ssprintf("Unsupport pooling mode %d", param.mode) \ megdnn_throw(ssprintf("Unsupport pooling mode %d", \
.c_str()); \ static_cast<int>(param.mode)) \
.c_str()); \
} }
#define DISPATCH_STRIDE(type, func) \ #define DISPATCH_STRIDE(type, func) \
...@@ -736,19 +737,20 @@ void PoolingImpl::AlgoFilter2ModexStridexNCHW44::exec( ...@@ -736,19 +737,20 @@ void PoolingImpl::AlgoFilter2ModexStridexNCHW44::exec(
} \ } \
MIDOUT_END(); MIDOUT_END();
#define DISPATCH_MODE(type, func, stride) \ #define DISPATCH_MODE(type, func, stride) \
switch (param.mode) { \ switch (param.mode) { \
case Mode::MAX: { \ case Mode::MAX: { \
DISPATCH_FUNC(type, func, stride, max); \ DISPATCH_FUNC(type, func, stride, max); \
break; \ break; \
} \ } \
case Mode::AVERAGE: { \ case Mode::AVERAGE: { \
DISPATCH_FUNC(type, func, stride, avg); \ DISPATCH_FUNC(type, func, stride, avg); \
break; \ break; \
} \ } \
default: \ default: \
megdnn_throw(ssprintf("Unsupport pooling mode %d", param.mode) \ megdnn_throw(ssprintf("Unsupport pooling mode %d", \
.c_str()); \ static_cast<int>(param.mode)) \
.c_str()); \
} }
#define DISPATCH_STRIDE(type, func) \ #define DISPATCH_STRIDE(type, func) \
...@@ -823,19 +825,20 @@ void PoolingImpl::AlgoFilter4ModexStridexNCHW44::exec( ...@@ -823,19 +825,20 @@ void PoolingImpl::AlgoFilter4ModexStridexNCHW44::exec(
} \ } \
MIDOUT_END(); MIDOUT_END();
#define DISPATCH_MODE(type, func, stride) \ #define DISPATCH_MODE(type, func, stride) \
switch (param.mode) { \ switch (param.mode) { \
case Mode::MAX: { \ case Mode::MAX: { \
DISPATCH_FUNC(type, func, stride, max); \ DISPATCH_FUNC(type, func, stride, max); \
break; \ break; \
} \ } \
case Mode::AVERAGE: { \ case Mode::AVERAGE: { \
DISPATCH_FUNC(type, func, stride, avg); \ DISPATCH_FUNC(type, func, stride, avg); \
break; \ break; \
} \ } \
default: \ default: \
megdnn_throw(ssprintf("Unsupport pooling mode %d", param.mode) \ megdnn_throw(ssprintf("Unsupport pooling mode %d", \
.c_str()); \ static_cast<int>(param.mode)) \
.c_str()); \
} }
#define DISPATCH_STRIDE(type, func) \ #define DISPATCH_STRIDE(type, func) \
...@@ -910,19 +913,20 @@ void PoolingImpl::AlgoFilter5ModexStridexNCHW44::exec( ...@@ -910,19 +913,20 @@ void PoolingImpl::AlgoFilter5ModexStridexNCHW44::exec(
} \ } \
MIDOUT_END(); MIDOUT_END();
#define DISPATCH_MODE(type, func, stride) \ #define DISPATCH_MODE(type, func, stride) \
switch (param.mode) { \ switch (param.mode) { \
case Mode::MAX: { \ case Mode::MAX: { \
DISPATCH_FUNC(type, func, stride, max); \ DISPATCH_FUNC(type, func, stride, max); \
break; \ break; \
} \ } \
case Mode::AVERAGE: { \ case Mode::AVERAGE: { \
DISPATCH_FUNC(type, func, stride, avg); \ DISPATCH_FUNC(type, func, stride, avg); \
break; \ break; \
} \ } \
default: \ default: \
megdnn_throw(ssprintf("Unsupport pooling mode %d", param.mode) \ megdnn_throw(ssprintf("Unsupport pooling mode %d", \
.c_str()); \ static_cast<int>(param.mode)) \
.c_str()); \
} }
#define DISPATCH_STRIDE(type, func) \ #define DISPATCH_STRIDE(type, func) \
...@@ -949,4 +953,3 @@ void PoolingImpl::AlgoFilter5ModexStridexNCHW44::exec( ...@@ -949,4 +953,3 @@ void PoolingImpl::AlgoFilter5ModexStridexNCHW44::exec(
} // namespace arm_common } // namespace arm_common
} // namespace megdnn } // namespace megdnn
// 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.
先完成此消息的编辑！
想要评论请 注册 或