mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use "#if" instead of "#ifdef" for CV_SIMD128.

Browse Source
This commit is contained in:
HAN Liutong 2022-07-21 03:23:57 +00:00
parent 0ef803950b
commit e2bfe0ce76
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/dnn/src/layers/fast_convolution/depthwise_convolution.cpp
View File

@ -19,7 +19,7 @@ static void depthWiseBlock(const float *inptr, float *outptr, const float *weigh
int dilation_y, int stride_x, int stride_y, int inner_xleft, int inner_xright, int inner_ytop, int dilation_y, int stride_x, int stride_y, int inner_xleft, int inner_xright, int inner_ytop,
int inner_ybottom, bool ifMinMaxAct, bool useSIMD, bool is3x3) int inner_ybottom, bool ifMinMaxAct, bool useSIMD, bool is3x3)
{ {
#ifdef CV_SIMD128 #if CV_SIMD128
v_float32x4 vminval = v_setall_f32(minval), vmaxval = v_setall_f32(maxval); v_float32x4 vminval = v_setall_f32(minval), vmaxval = v_setall_f32(maxval);
v_float32x4 w0 = v_setall_f32( v_float32x4 w0 = v_setall_f32(
@ -44,7 +44,7 @@ static void depthWiseBlock(const float *inptr, float *outptr, const float *weigh
int dy0 = 1; int dy0 = 1;
for (int y0 = 0; y0 < H0; y0 += dy0, outptr += W0 * dy0) for (int y0 = 0; y0 < H0; y0 += dy0, outptr += W0 * dy0)
{ {
#ifdef CV_SIMD128 #if CV_SIMD128
dy0 = inner_ytop <= y0 && y0 + 3 < inner_ybottom && is3x3 && stride_y == 1 && dilation_y == 1 dy0 = inner_ytop <= y0 && y0 + 3 < inner_ybottom && is3x3 && stride_y == 1 && dilation_y == 1
? 3 : 1; ? 3 : 1;
#endif #endif
@ -103,7 +103,7 @@ static void depthWiseBlock(const float *inptr, float *outptr, const float *weigh
if (x0 == W0) if (x0 == W0)
break; break;
x1 = inner_xright; x1 = inner_xright;
#ifdef CV_SIMD128 #if CV_SIMD128
if (useSIMD) if (useSIMD)
{ {
if (is3x3) if (is3x3)