apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-16 22:01:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

dnn_backend_native_layer_mathbinary: add floormod support

Browse Source 
Signed-off-by: Mingyu Yin <mingyu.yin@intel.com>
This commit is contained in:
Mingyu Yin
2020-08-23 23:12:13 +08:00
committed by Guo, Yejun
parent 37ef1acedb
commit 3477feb643
5 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
View File

@@ -50,6 +50,10 @@ static float minimum(float src0, float src1)
{ {
return FFMIN(src0, src1); return FFMIN(src0, src1);
} }
static float floormod(float src0, float src1)
{
return (float)((int)(src0) % (int)(src1));
}
static void math_binary_commutative(FunType pfun, const DnnLayerMathBinaryParams *params, const DnnOperand *input, DnnOperand *output, DnnOperand *operands, const int32_t *input_operand_indexes) static void math_binary_commutative(FunType pfun, const DnnLayerMathBinaryParams *params, const DnnOperand *input, DnnOperand *output, DnnOperand *operands, const int32_t *input_operand_indexes)
{ {
@@ -178,6 +182,9 @@ int dnn_execute_layer_math_binary(DnnOperand *operands, const int32_t *input_ope
case DMBO_MINIMUM: case DMBO_MINIMUM:
math_binary_commutative(minimum, params, input, output, operands, input_operand_indexes); math_binary_commutative(minimum, params, input, output, operands, input_operand_indexes);
return 0; return 0;
case DMBO_FLOORMOD:
math_binary_not_commutative(floormod, params, input, output, operands, input_operand_indexes);
return 0;
default: default:
return -1; return -1;
} }

1
libavfilter/dnn/dnn_backend_native_layer_mathbinary.h
View File

@@ -36,6 +36,7 @@ typedef enum {
DMBO_MUL = 2, DMBO_MUL = 2,
DMBO_REALDIV = 3, DMBO_REALDIV = 3,
DMBO_MINIMUM = 4, DMBO_MINIMUM = 4,
DMBO_FLOORMOD = 5,
DMBO_COUNT DMBO_COUNT
} DNNMathBinaryOperation; } DNNMathBinaryOperation;

5
tests/dnn/dnn-layer-mathbinary-test.c
View File

@@ -40,6 +40,8 @@ static float get_expected(float f1, float f2, DNNMathBinaryOperation op)
return f1 / f2; return f1 / f2;
case DMBO_MINIMUM: case DMBO_MINIMUM:
return (f1 < f2) ? f1 : f2; return (f1 < f2) ? f1 : f2;
case DMBO_FLOORMOD:
return (float)((int)(f1) % (int)(f2));
default: default:
av_assert0(!"not supported yet"); av_assert0(!"not supported yet");
return 0.f; return 0.f;
@@ -205,5 +207,8 @@ int main(int argc, char **argv)
if (test(DMBO_MINIMUM)) if (test(DMBO_MINIMUM))
return 1; return 1;
if (test(DMBO_FLOORMOD))
return 1;
return 0; return 0;
} }

2
tools/python/convert_from_tensorflow.py
View File

@@ -73,7 +73,7 @@ class TFConverter:
self.conv2d_scopename_inputname_dict = {} self.conv2d_scopename_inputname_dict = {}
self.op2code = {'Conv2D':1, 'DepthToSpace':2, 'MirrorPad':3, 'Maximum':4, self.op2code = {'Conv2D':1, 'DepthToSpace':2, 'MirrorPad':3, 'Maximum':4,
'MathBinary':5, 'MathUnary':6, 'AvgPool':7} 'MathBinary':5, 'MathUnary':6, 'AvgPool':7}
self.mathbin2code = {'Sub':0, 'Add':1, 'Mul':2, 'RealDiv':3, 'Minimum':4} self.mathbin2code = {'Sub':0, 'Add':1, 'Mul':2, 'RealDiv':3, 'Minimum':4, 'FloorMod':5}
self.mathun2code = {'Abs':0, 'Sin':1, 'Cos':2, 'Tan':3, 'Asin':4, self.mathun2code = {'Abs':0, 'Sin':1, 'Cos':2, 'Tan':3, 'Asin':4,
'Acos':5, 'Atan':6, 'Sinh':7, 'Cosh':8, 'Tanh':9, 'Asinh':10, 'Acos':5, 'Atan':6, 'Sinh':7, 'Cosh':8, 'Tanh':9, 'Asinh':10,
'Acosh':11, 'Atanh':12, 'Ceil':13, 'Floor':14, 'Round':15} 'Acosh':11, 'Atanh':12, 'Ceil':13, 'Floor':14, 'Round':15}

2
tools/python/convert_header.py
View File

@@ -23,4 +23,4 @@ str = 'FFMPEGDNNNATIVE'
major = 1 major = 1
# increase minor when we don't have to re-convert the model file # increase minor when we don't have to re-convert the model file
minor = 21 minor = 22