From bfe945fb8571554895635be37510d46abdc11535 Mon Sep 17 00:00:00 2001 From: Megvii Engine Team Date: Fri, 15 May 2020 11:12:32 +0800 Subject: [PATCH] fix(dnn/arm): fix pooling printf datatype GitOrigin-RevId: 056a577fa66c4bc11f0b9ae8d3f4b0469e252ed6 --- dnn/src/arm_common/pooling/algo.cpp | 109 ++++++++++++++-------------- 1 file changed, 56 insertions(+), 53 deletions(-) diff --git a/dnn/src/arm_common/pooling/algo.cpp b/dnn/src/arm_common/pooling/algo.cpp index 9ae81eea..4962a00c 100644 --- a/dnn/src/arm_common/pooling/algo.cpp +++ b/dnn/src/arm_common/pooling/algo.cpp @@ -649,19 +649,20 @@ void PoolingImpl::AlgoFilter3ModexStridexNCHW44::exec( } \ MIDOUT_END(); -#define DISPATCH_MODE(type, func, stride) \ - switch (param.mode) { \ - case Mode::MAX: { \ - DISPATCH_FUNC(type, func, stride, max); \ - break; \ - } \ - case Mode::AVERAGE: { \ - DISPATCH_FUNC(type, func, stride, avg); \ - break; \ - } \ - default: \ - megdnn_throw(ssprintf("Unsupport pooling mode %d", param.mode) \ - .c_str()); \ +#define DISPATCH_MODE(type, func, stride) \ + switch (param.mode) { \ + case Mode::MAX: { \ + DISPATCH_FUNC(type, func, stride, max); \ + break; \ + } \ + case Mode::AVERAGE: { \ + DISPATCH_FUNC(type, func, stride, avg); \ + break; \ + } \ + default: \ + megdnn_throw(ssprintf("Unsupport pooling mode %d", \ + static_cast(param.mode)) \ + .c_str()); \ } #define DISPATCH_STRIDE(type, func) \ @@ -736,19 +737,20 @@ void PoolingImpl::AlgoFilter2ModexStridexNCHW44::exec( } \ MIDOUT_END(); -#define DISPATCH_MODE(type, func, stride) \ - switch (param.mode) { \ - case Mode::MAX: { \ - DISPATCH_FUNC(type, func, stride, max); \ - break; \ - } \ - case Mode::AVERAGE: { \ - DISPATCH_FUNC(type, func, stride, avg); \ - break; \ - } \ - default: \ - megdnn_throw(ssprintf("Unsupport pooling mode %d", param.mode) \ - .c_str()); \ +#define DISPATCH_MODE(type, func, stride) \ + switch (param.mode) { \ + case Mode::MAX: { \ + DISPATCH_FUNC(type, func, stride, max); \ + break; \ + } \ + case Mode::AVERAGE: { \ + DISPATCH_FUNC(type, func, stride, avg); \ + break; \ + } \ + default: \ + megdnn_throw(ssprintf("Unsupport pooling mode %d", \ + static_cast(param.mode)) \ + .c_str()); \ } #define DISPATCH_STRIDE(type, func) \ @@ -823,19 +825,20 @@ void PoolingImpl::AlgoFilter4ModexStridexNCHW44::exec( } \ MIDOUT_END(); -#define DISPATCH_MODE(type, func, stride) \ - switch (param.mode) { \ - case Mode::MAX: { \ - DISPATCH_FUNC(type, func, stride, max); \ - break; \ - } \ - case Mode::AVERAGE: { \ - DISPATCH_FUNC(type, func, stride, avg); \ - break; \ - } \ - default: \ - megdnn_throw(ssprintf("Unsupport pooling mode %d", param.mode) \ - .c_str()); \ +#define DISPATCH_MODE(type, func, stride) \ + switch (param.mode) { \ + case Mode::MAX: { \ + DISPATCH_FUNC(type, func, stride, max); \ + break; \ + } \ + case Mode::AVERAGE: { \ + DISPATCH_FUNC(type, func, stride, avg); \ + break; \ + } \ + default: \ + megdnn_throw(ssprintf("Unsupport pooling mode %d", \ + static_cast(param.mode)) \ + .c_str()); \ } #define DISPATCH_STRIDE(type, func) \ @@ -910,19 +913,20 @@ void PoolingImpl::AlgoFilter5ModexStridexNCHW44::exec( } \ MIDOUT_END(); -#define DISPATCH_MODE(type, func, stride) \ - switch (param.mode) { \ - case Mode::MAX: { \ - DISPATCH_FUNC(type, func, stride, max); \ - break; \ - } \ - case Mode::AVERAGE: { \ - DISPATCH_FUNC(type, func, stride, avg); \ - break; \ - } \ - default: \ - megdnn_throw(ssprintf("Unsupport pooling mode %d", param.mode) \ - .c_str()); \ +#define DISPATCH_MODE(type, func, stride) \ + switch (param.mode) { \ + case Mode::MAX: { \ + DISPATCH_FUNC(type, func, stride, max); \ + break; \ + } \ + case Mode::AVERAGE: { \ + DISPATCH_FUNC(type, func, stride, avg); \ + break; \ + } \ + default: \ + megdnn_throw(ssprintf("Unsupport pooling mode %d", \ + static_cast(param.mode)) \ + .c_str()); \ } #define DISPATCH_STRIDE(type, func) \ @@ -949,4 +953,3 @@ void PoolingImpl::AlgoFilter5ModexStridexNCHW44::exec( } // namespace arm_common } // namespace megdnn // vim: syntax=cpp.doxygen - -- GitLab